[Jrisk-cvs] SF.net SVN: domination-code:[2643] Domination/swingUI/src/net/yura/ domination

[<yu...@us...>]

Revision: 2643
          http://sourceforge.net/p/domination/code/2643
Author:   yuranet
Date:     2025-02-10 22:20:41 +0000 (Mon, 10 Feb 2025)
Log Message:
-----------
fix for SwingGUI players panel on hi res linux

Modified Paths:
--------------
    Domination/swingUI/src/net/yura/domination/guishared/RiskUIUtil.java
    Domination/swingUI/src/net/yura/domination/ui/flashgui/GameFrame.java
    Domination/swingUI/src/net/yura/domination/ui/flashgui/MissionDialog.java
    Domination/swingUI/src/net/yura/domination/ui/swinggui/GameTab.java

Modified: Domination/swingUI/src/net/yura/domination/guishared/RiskUIUtil.java
===================================================================
--- Domination/swingUI/src/net/yura/domination/guishared/RiskUIUtil.java	2025-02-10 22:09:40 UTC (rev 2642)
+++ Domination/swingUI/src/net/yura/domination/guishared/RiskUIUtil.java	2025-02-10 22:20:41 UTC (rev 2643)
@@ -489,6 +489,13 @@
             window.setLocation((screenSize.width - frameSize.width) / 2, (screenSize.height - frameSize.height) / 2);
         }
 
+        /**
+         * @see GraphicsUtil#scale(int)
+         */
+        public static int unscale(int size) {
+            return (int) Math.ceil(size * GraphicsUtil.scale / GraphicsUtil.density);
+        }
+
         private static List getFileList(final String a) {
 
             List namesvector = new ArrayList();

Modified: Domination/swingUI/src/net/yura/domination/ui/flashgui/GameFrame.java
===================================================================
--- Domination/swingUI/src/net/yura/domination/ui/flashgui/GameFrame.java	2025-02-10 22:09:40 UTC (rev 2642)
+++ Domination/swingUI/src/net/yura/domination/ui/flashgui/GameFrame.java	2025-02-10 22:20:41 UTC (rev 2643)
@@ -309,7 +309,7 @@
                                         int colorXScaled = (getWidth() - GraphicsUtil.scale(177)) - (GraphicsUtil.scale(colorH) * (cols.length - c));
 					g.fillRect(colorXScaled, GraphicsUtil.scale(colorY), GraphicsUtil.scale(colorH), GraphicsUtil.scale(colorH));
                                         if (colorImg != null) {
-                                            GraphicsUtil.drawImageInRect(g, colorImg, unscale(colorXScaled)+2, colorY+2, colorH-4, colorH-4, this);
+                                            GraphicsUtil.drawImageInRect(g, colorImg, RiskUIUtil.unscale(colorXScaled)+2, colorY+2, colorH-4, colorH-4, this);
                                         }
 				}
 			}
@@ -486,13 +486,6 @@
                     }
                 }, KeyStroke.getKeyStroke(KeyEvent.VK_S, Toolkit.getDefaultToolkit().getMenuShortcutKeyMask()), JComponent.WHEN_IN_FOCUSED_WINDOW );
 	}
-        
-        /**
-         * @see GraphicsUtil#scale(int)
-         */
-        public static int unscale(int size) {
-            return (int) Math.ceil(size * GraphicsUtil.scale / GraphicsUtil.density);
-        }
 
         public void setExtraAction(Action action) {
             extraAction = action;

Modified: Domination/swingUI/src/net/yura/domination/ui/flashgui/MissionDialog.java
===================================================================
--- Domination/swingUI/src/net/yura/domination/ui/flashgui/MissionDialog.java	2025-02-10 22:09:40 UTC (rev 2642)
+++ Domination/swingUI/src/net/yura/domination/ui/flashgui/MissionDialog.java	2025-02-10 22:20:41 UTC (rev 2643)
@@ -101,7 +101,7 @@
 	    //GraphicsUtil.drawImage(g, mission, 0, 0, this);
 
             GraphicsUtil.drawImage(g, mission,
-                    40, 60, GameFrame.unscale(getWidth()) -40, GameFrame.unscale(getHeight()) -40,
+                    40, 60, RiskUIUtil.unscale(getWidth()) -40, RiskUIUtil.unscale(getHeight()) -40,
                     40, 60, 150 -40, 230 -40, this);
 
 	    Graphics2D g2 = (Graphics2D)g;
@@ -116,7 +116,7 @@
             g.setFont(font);
             g2.setColor( GameFrame.UI_COLOR );
 
-            GraphicsUtil.drawStringCenteredAt(g, text, GameFrame.unscale(getWidth() / 2), 70, GameFrame.unscale(getWidth()) - 50);
+            GraphicsUtil.drawStringCenteredAt(g, text, RiskUIUtil.unscale(getWidth() / 2), 70, RiskUIUtil.unscale(getWidth()) - 50);
 	}
     }
 

Modified: Domination/swingUI/src/net/yura/domination/ui/swinggui/GameTab.java
===================================================================
--- Domination/swingUI/src/net/yura/domination/ui/swinggui/GameTab.java	2025-02-10 22:09:40 UTC (rev 2642)
+++ Domination/swingUI/src/net/yura/domination/ui/swinggui/GameTab.java	2025-02-10 22:20:41 UTC (rev 2643)
@@ -909,12 +909,12 @@
                                 
                                 Image img = swingGUIPanel.pp.getIconForColor(colors[c]);
                                 if (img != null) {
-                                    GraphicsUtil.drawImageInRect(g, img, ((width / colors.length) * c) + 2, 2, width / colors.length - 5, height - 5, this);
+                                    GraphicsUtil.drawImageInRect(g, img, RiskUIUtil.unscale((width / colors.length) * c) + 2, 2, RiskUIUtil.unscale(width / colors.length) - 5, RiskUIUtil.unscale(height) - 5, this);
                                 }
 			}
 
 			g.setColor( new Color( ColorUtil.getTextColorFor( colors[0] ) ) );
-			g.drawRect( 2 , 2 , (width/colors.length)-5 , height - 5);
+			g.drawRect(2, 2, (width/colors.length) - 5, height - 5);
 
 			g.setColor( Color.black );
 			g.drawLine((width / colors.length) - 1, 0, (width / colors.length) - 1, height - 1);