Smooth scaling [1]: Remove unused code #60
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gujjwal00
changed the title
gujjwal00
commented
Mar 17, 2020
Comment on lines
-14
to
-44
| public static final int zoomableId = -1; | ||
| private static final int scaleModeIds[] = { zoomableId }; | ||
|
|
||
| private static AbstractScaling[] scalings; | ||
|
|
||
| static AbstractScaling getById(int id) | ||
| { | ||
| if ( scalings==null) | ||
| { | ||
| scalings=new AbstractScaling[scaleModeIds.length]; | ||
| } | ||
| for ( int i=0; i<scaleModeIds.length; ++i) | ||
| { | ||
| if ( scaleModeIds[i]==id) | ||
| { | ||
| if ( scalings[i]==null) | ||
| { | ||
| switch ( id ) | ||
| { | ||
|
|
||
| case zoomableId: | ||
| scalings[i]=new ZoomScaling(); | ||
| break; | ||
| } | ||
| } | ||
| return scalings[i]; | ||
| } | ||
| } | ||
| throw new IllegalArgumentException("Unknown scaling id " + id); | ||
| } | ||
|
|
Contributor
Author
There was a problem hiding this comment.
These static fields & methods (along with getByScaleType() below) are used for creating new scaling instances. But we only have ZoomScaling. Now we create new ZoomScaling object directly which makes all these obsolete.
gujjwal00
commented
Mar 17, 2020
| void setScaleTypeForActivity(VncCanvasActivity activity){ | ||
| activity.zoomer.hide(); | ||
| activity.vncCanvas.scaling = this; | ||
| activity.vncCanvas.setScaleType(scaleType); |
Contributor
Author
There was a problem hiding this comment.
Scale type is not used by VncCanvas
gujjwal00
commented
Mar 17, 2020
Comment on lines
-94
to
-98
| /** | ||
| * True if this scale type allows panning of the image | ||
| * @return | ||
| */ | ||
| abstract boolean isAbleToPan(); |
Contributor
Author
There was a problem hiding this comment.
isAbleToPan() is always true for ZoomScaling.
gujjwal00
commented
Mar 17, 2020
Comment on lines
-100
to
-106
| /** | ||
| * True if the listed input mode is valid for this scaling mode | ||
| * @param mode Id of the input mode | ||
| * @return True if the input mode is compatible with the scaling mode | ||
| */ | ||
| abstract boolean isValidInputMode(int mode); | ||
|
|
Contributor
Author
There was a problem hiding this comment.
This is not used anymore.
gujjwal00
commented
Mar 17, 2020
Comment on lines
-825
to
-836
|
|
||
| public int getCenteredXOffset() { | ||
| int xoffset = (vncConn.getFramebufferWidth() - getWidth()) / 2; | ||
| return xoffset; | ||
| } | ||
|
|
||
| public int getCenteredYOffset() { | ||
| int yoffset = (vncConn.getFramebufferHeight() - getHeight()) / 2; | ||
| return yoffset; | ||
| } | ||
|
|
||
|
|
Contributor
Author
There was a problem hiding this comment.
These were used for updating scaling matrix.
gujjwal00
commented
Mar 17, 2020
| AbstractScaling.getByScaleType(connection.getScaleMode()) | ||
| .setScaleTypeForActivity(this); | ||
|
|
||
| new ZoomScaling().setScaleTypeForActivity(this); |
Contributor
Author
There was a problem hiding this comment.
We directly create an object of ZoomScaling. It removes the need of static factory methods in AbstractScaling.
gujjwal00
commented
Mar 17, 2020
Comment on lines
-16
to
-18
| private Matrix matrix; | ||
| int canvasXOffset; | ||
| int canvasYOffset; |
Contributor
Author
There was a problem hiding this comment.
These were used before OpenGL scaling. Now they are redundant.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR removes unused code related to scaling. Issue: #59 .
Edit: I have added some reasons for cleanup.