[Developement] Added "auto scaling" feature to Applet.
[BugFix] NullPointerException when changing option before canvas created.
[BugFix] Wrong default value in "Auto Scroll" combo box (class OptionsFrame).
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3287 3789f03b-4d11-0410-bbf8-ca57d06f2519
diff --git a/java/src/com/tightvnc/vncviewer/OptionsFrame.java b/java/src/com/tightvnc/vncviewer/OptionsFrame.java
index c8d1b04..5034af6 100644
--- a/java/src/com/tightvnc/vncviewer/OptionsFrame.java
+++ b/java/src/com/tightvnc/vncviewer/OptionsFrame.java
@@ -183,8 +183,8 @@
String s = viewer.readParameter("Scaling Factor", false);
if (s == null) s = "100%";
setScalingFactor(s);
- if (!s.equalsIgnoreCase("Auto")) {
- choices[scalingFactorIndex].select(s.trim() + '%');
+ if (autoScale) {
+ choices[scalingFactorIndex].select("Auto");
} else {
choices[scalingFactorIndex].select(s);
}
@@ -447,7 +447,8 @@
} else if (source == choices[scalingFactorIndex]){
// Tell VNC canvas that scaling factor has changed
setScalingFactor(choices[scalingFactorIndex].getSelectedItem());
- viewer.vc.setScalingFactor(scalingFactor);
+ if (viewer.vc != null)
+ viewer.vc.setScalingFactor(scalingFactor);
}
}