commit 4644abb3e6024d960f98b09c7b11d8dd89c3772b
author Brian P. Hinz <bphinz@users.sf.net> Thu Aug 20 01:46:00 2015 -0400
committer Brian P. Hinz <bphinz@users.sf.net> Thu Aug 20 01:46:00 2015 -0400
tree 1d972d49d3a32785e7c69cfe8b9364da0cbc0e60
parent 8442509bca6db16a009784517fd1a2531b9476b6

Disable desktopSize option for embedded applets

java/com/tigervnc/vncviewer/OptionsDialog.java

diff --git a/java/com/tigervnc/vncviewer/OptionsDialog.java b/java/com/tigervnc/vncviewer/OptionsDialog.java
index ebfaed7..6eb0072 100644
--- a/java/com/tigervnc/vncviewer/OptionsDialog.java
+++ b/java/com/tigervnc/vncviewer/OptionsDialog.java
@@ -167,7 +167,8 @@
     ScreenPanel=new JPanel(new GridBagLayout());
     desktopSize = new JCheckBox("Resize remote session on connect");
     desktopSize.addItemListener(this);
-    desktopSize.setEnabled(cc.viewer.desktopSize.getValue() != null);
+    desktopSize.setEnabled(!cc.viewer.embed.getValue() &&
+                           (cc.viewer.desktopSize.getValue() != null));
     NumberFormat format = NumberFormat.getIntegerInstance();
     format.setMaximumIntegerDigits(5);
     format.setMinimumIntegerDigits(0);