Mercurial > hg > Applications > TreeVNC
changeset 375:bd74b2406775
Add zoom fit to client mode
author | innparusu |
---|---|
date | Tue, 25 Aug 2015 23:00:01 +0900 |
parents | 638b604aa508 |
children | 1e4285df9afb |
files | .idea/workspace.xml src/viewer_swing/java/com/glavsoft/viewer/Viewer.java |
diffstat | 2 files changed, 27 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/workspace.xml Tue Aug 25 18:04:01 2015 +0900 +++ b/.idea/workspace.xml Tue Aug 25 23:00:01 2015 +0900 @@ -2,8 +2,7 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="0a04b9e3-21eb-43ee-b441-59e664eecd89" name="Default" comment="setFitScreen in ReceiverTask"> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" afterPath="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> </list> <ignored path="TreeVNC.iws" /> <ignored path=".idea/workspace.xml" /> @@ -91,7 +90,7 @@ <file leaf-file-name="TreeRFBProto.java" pinned="false" current-in-tab="true"> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-0.034013607" vertical-offset="7200" max-vertical-offset="12300"> + <state vertical-scroll-proportion="-0.20408164" vertical-offset="7425" max-vertical-offset="12300"> <caret line="548" column="5" selection-start-line="548" selection-start-column="5" selection-end-line="548" selection-end-column="5" /> <folding /> </state> @@ -124,10 +123,10 @@ </split-first> <split-second> <leaf> - <file leaf-file-name="ConnectionPresenter.java" pinned="false" current-in-tab="true"> + <file leaf-file-name="ConnectionPresenter.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.45267177" vertical-offset="5863" max-vertical-offset="7872"> + <state vertical-scroll-proportion="0.0" vertical-offset="6562" max-vertical-offset="7872"> <caret line="329" column="5" selection-start-line="329" selection-start-column="5" selection-end-line="329" selection-end-column="5" /> <folding /> </state> @@ -174,6 +173,16 @@ </provider> </entry> </file> + <file leaf-file-name="Viewer.java" pinned="false" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.7823129" vertical-offset="3495" max-vertical-offset="6150"> + <caret line="361" column="33" selection-start-line="361" selection-start-column="33" selection-end-line="361" selection-end-column="33" /> + <folding /> + </state> + </provider> + </entry> + </file> <file leaf-file-name="SwingRfbConnectionWorker.java" pinned="false" current-in-tab="false"> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java"> <provider selected="true" editor-type-id="text-editor"> @@ -465,10 +474,10 @@ <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/test/IsRetina.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/ReceiverTask.java" /> <option value="$PROJECT_DIR$/src/main/java/com/glavsoft/rfb/protocol/Protocol.java" /> - <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> <option value="$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingRfbConnectionWorker.java" /> <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java" /> + <option value="$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java" /> </list> </option> </component> @@ -953,7 +962,7 @@ <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.10870699" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.32791728" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32791728" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.13034411" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> @@ -1475,19 +1484,6 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java"> - <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.33333334" vertical-offset="4695" max-vertical-offset="11620"> - <caret line="232" column="16" selection-start-line="232" selection-start-column="16" selection-end-line="232" selection-end-column="16" /> - <folding> - <element signature="e#9069#9070#0" expanded="true" /> - <element signature="e#9112#9113#0" expanded="true" /> - <element signature="e#10921#11074#0" expanded="true" /> - <element signature="e#11073#11074#0" expanded="true" /> - </folding> - </state> - </provider> - </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java"> <provider selected="true" editor-type-id="text-editor"> <state vertical-scroll-proportion="0.0" vertical-offset="7571" max-vertical-offset="21625"> @@ -1514,7 +1510,7 @@ </entry> <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/ConnectionPresenter.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="0.45267177" vertical-offset="5863" max-vertical-offset="7872"> + <state vertical-scroll-proportion="0.0" vertical-offset="6562" max-vertical-offset="7872"> <caret line="329" column="5" selection-start-line="329" selection-start-column="5" selection-end-line="329" selection-end-column="5" /> <folding /> </state> @@ -1522,12 +1518,20 @@ </entry> <entry file="file://$PROJECT_DIR$/src/main/java/jp/ac/u_ryukyu/treevnc/TreeRFBProto.java"> <provider selected="true" editor-type-id="text-editor"> - <state vertical-scroll-proportion="-0.034013607" vertical-offset="7200" max-vertical-offset="12300"> + <state vertical-scroll-proportion="-0.20408164" vertical-offset="7425" max-vertical-offset="12300"> <caret line="548" column="5" selection-start-line="548" selection-start-column="5" selection-end-line="548" selection-end-column="5" /> <folding /> </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java"> + <provider selected="true" editor-type-id="text-editor"> + <state vertical-scroll-proportion="0.7823129" vertical-offset="3495" max-vertical-offset="6150"> + <caret line="361" column="33" selection-start-line="361" selection-start-column="33" selection-end-line="361" selection-end-column="33" /> + <folding /> + </state> + </provider> + </entry> </component> <component name="masterDetails"> <states>
--- a/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Tue Aug 25 18:04:01 2015 +0900 +++ b/src/viewer_swing/java/com/glavsoft/viewer/Viewer.java Tue Aug 25 23:00:01 2015 +0900 @@ -464,7 +464,7 @@ public void setFitScreen() { SwingViewerWindow v = connectionPresenter.getViewer(); if (v != null) { - v.fitScreen(); + v.zoomToFit(); } }