Преглед изворни кода

Fix broken button bar.

Change-Id: I15d8740a80b35b8e2c489df7af6a4e31394a7258
Fixes-Issue: CLIENT-356
Reviewed-on: http://gerrit.dmdirc.com/2425
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Build Manager
tags/0.7rc1
Greg Holmes пре 12 година
родитељ
комит
cab1a30516
1 измењених фајлова са 6 додато и 9 уклоњено
  1. 6
    9
      src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/ButtonBar.java

+ 6
- 9
src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/ButtonBar.java Прегледај датотеку

@@ -35,8 +35,8 @@ import com.dmdirc.interfaces.ConfigChangeListener;
35 35
 import com.dmdirc.interfaces.FrameInfoListener;
36 36
 import com.dmdirc.interfaces.NotificationListener;
37 37
 import com.dmdirc.interfaces.ui.Window;
38
-import com.dmdirc.ui.WindowManager;
39 38
 import com.dmdirc.ui.Colour;
39
+import com.dmdirc.ui.WindowManager;
40 40
 
41 41
 import java.awt.Dimension;
42 42
 import java.awt.Insets;
@@ -72,11 +72,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
72 72
         ComponentListener, Serializable, NotificationListener,
73 73
         FrameInfoListener, MouseListener, ConfigChangeListener {
74 74
 
75
-    /**
76
-     * A version number for this class. It should be changed whenever the class
77
-     * structure is changed (or anything else that would prevent serialized
78
-     * objects being unserialized with the new class).
79
-     */
75
+    /** Serial version UID. */
80 76
     private static final long serialVersionUID = 3;
81 77
     /** The default number of buttons per row or column. */
82 78
     private static final int NUM_CELLS = 1;
@@ -217,6 +213,10 @@ public final class ButtonBar implements FrameManager, ActionListener,
217 213
         this.windowFactory = controller.getWindowFactory();
218 214
         this.controller = controller;
219 215
 
216
+        position = FramemanagerPosition.getPosition(
217
+        controller.getGlobalConfig().getOption("ui",
218
+                "framemanagerPosition"));
219
+
220 220
         if (position.isHorizontal()) {
221 221
             buttonPanel = new ButtonPanel(controller,
222 222
                     new MigLayout("ins rel, fill, flowx"), this);
@@ -229,9 +229,6 @@ public final class ButtonBar implements FrameManager, ActionListener,
229 229
 
230 230
         buttons = Collections.synchronizedMap(
231 231
                 new HashMap<Window, FrameToggleButton>());
232
-        position = FramemanagerPosition.getPosition(
233
-        controller.getGlobalConfig().getOption("ui",
234
-                "framemanagerPosition"));
235 232
         sortChildWindows = controller.getGlobalConfig()
236 233
                 .getOptionBool("ui", "sortchildwindows");
237 234
         sortRootWindows = controller.getGlobalConfig()

Loading…
Откажи
Сачувај