Commit: 54 - Moenizer (svn)

OmegaT の背景に画像を表示します。

Commit MetaInfo

• Revision: 54 (tree)
• Time: 2014-05-25 23:29:12
• Author: yu-tang

Log Message

メインウィンドウに背景設定した場合、エディターも除外できるようにした

Change Summary

• modified: trunk/src/jp/sourceforge/users/yutang/omegat/plugin/moenizer/MoeUI.java

Incremental Difference

--- trunk/src/jp/sourceforge/users/yutang/omegat/plugin/moenizer/MoeUI.java	(revision 53)
+++ trunk/src/jp/sourceforge/users/yutang/omegat/plugin/moenizer/MoeUI.java	(revision 54)
@@ -174,7 +174,7 @@
                     makeTransparentStatusbar = !exclude.contains(Parts.StatusBar);
                     makeTransparentPaneTitlebar = !exclude.contains(Parts.PaneTitleBar);
                 }
-                transparent();
+                transparent(exclude);
                 break;
 
             case EDITOR:
@@ -207,7 +207,7 @@
         }
     }
 
-    private void transparent() {
+    private void transparent(EnumSet<Parts> exclude) {
         UIThreadsUtil.mustBeSwingThread();
 
         if (makeTransparentMenubar) {
@@ -220,12 +220,13 @@
             MoeRootPaneUI ui = (MoeRootPaneUI) uis.get(Parts.MainWindow);
             ui.setMarginTop(marginTop);
         }
-        transparentRecursive(contentPane);
-        removeInstantStartBgColor();
+        transparentRecursive(contentPane, exclude);
+        if (!exclude.contains(Parts.EDITOR)) {
+            removeInstantStartBgColor();
+        }
 
         // try to make transparent editor pane
-        //@@TODO エディターが除外パーツになっている場合を考慮
-        if (!isEditorTransparent) {
+        if (!exclude.contains(Parts.EDITOR) && !isEditorTransparent) {
             isEditorTransparent = transparentEditor();
             if (!isEditorTransparent) {
                 CoreEvents.registerProjectChangeListener(this);
@@ -374,7 +375,7 @@
         menuBar.setUI ( new WindowsMenuBarUI () {
             @Override
             public void paint ( Graphics g, JComponent c ) {
-                int alpha = 100; // transparent <- 0...255 -> opaque
+                int alpha = 100; // transparent <- 0...255 -> opaque //@@TODO sdjust value
                 Color oldColor = g.getColor();
                 Color color = SystemColor.menu;
                 g.setColor ( new Color( color.getRGB() & 0xffffff | alpha << 24, true));
@@ -385,20 +386,20 @@
         menuBar.setOpaque(false);
     }
     
-    private void transparentRecursive(Component component) {
+    private void transparentRecursive(Component component, EnumSet<Parts> exclude) {
         // StatusBar
-        if (!makeTransparentStatusbar && statusBar.equals(component)) {
+        if (exclude.contains(Parts.StatusBar) && statusBar.equals(component)) {
             return;
         }
         
         // ButtonPanel
-        if (!makeTransparentButtonPanel && buttonPanel.equals(component)) {
+        if (exclude.contains(Parts.ButtonPanel) && buttonPanel.equals(component)) {
             return;
         }
 
         if (component instanceof JComponent) {
             JComponent c = (JComponent) component;
-            if (c.isOpaque()) {
+            if (c.isShowing() && c.isOpaque()) {
                 c.setOpaque(false);
             }
         }
@@ -406,16 +407,16 @@
         if (component instanceof Container) {
             Container container = (Container) component;
             for (Component c: container.getComponents()) {
-                transparentRecursive(c);
+                transparentRecursive(c, exclude);
             }
         }
 
         if (component instanceof DockingDesktop) {
-            transparentRecursive((DockingDesktop) component);
+            transparentRecursive((DockingDesktop) component, exclude);
         }
     }
         
-    private void transparentRecursive(DockingDesktop desktop) {
+    private void transparentRecursive(DockingDesktop desktop, EnumSet<Parts> exclude) {
         //DockingPanel dockingPanel = dockingDesktop.getDockingPanel(); // Scoping NG
         // DockingPanel にアクセスできないので、下位要素から上にさかのぼって処理する。
         // 階層的には、こんな感じになっている。
@@ -429,7 +430,10 @@
         ArrayList<Dockable> dockables = desktop.getContext()
                 .getDockablesByState(desktop, DockableState.STATE_DOCKED);
         for (Dockable d : dockables) {
-            transparentRecursive(d);
+            Parts part = Parts.valueOf(d.getDockKey().getKey());
+            if (!exclude.contains(part)) {
+                transparentRecursive(d);
+            }
         }
     }