[Jrisk-cvs] SF.net SVN: domination-code:[2702] Domination
Brought to you by:
yuranet
Menu
▾
▴
[Jrisk-cvs] SF.net SVN: domination-code:[2702] Domination
|
From: <yu...@us...> - 2025-11-23 19:44:26
|
Revision: 2702
http://sourceforge.net/p/domination/code/2702
Author: yuranet
Date: 2025-11-23 19:44:24 +0000 (Sun, 23 Nov 2025)
Log Message:
-----------
move EdgeToEdgeBorder into SwingME
Modified Paths:
--------------
Domination/android/AndroidManifest.xml
Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/GameWindow.java
Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/MainMenu.java
Removed Paths:
-------------
Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/EdgeToEdgeBorder.java
Modified: Domination/android/AndroidManifest.xml
===================================================================
--- Domination/android/AndroidManifest.xml 2025-11-23 14:32:19 UTC (rev 2701)
+++ Domination/android/AndroidManifest.xml 2025-11-23 19:44:24 UTC (rev 2702)
@@ -8,7 +8,7 @@
<!-- android:targetSdkVersion 11 to hide the legacy menu button on tablets -->
<!-- android:targetSdkVersion 14 to hide the legacy menu button on phones -->
<!-- this also has a side effect of hiding the legacy resize button -->
- <uses-sdk android:targetSdkVersion="34"
+ <uses-sdk android:targetSdkVersion="35"
tools:overrideLibrary="android.support.fragment,android.arch.lifecycle,com.google.android.gms.games,com.google.android.gms.auth.api.phone,com.google.android.gms.tasks,com.google.android.gms.auth.api,com.google.android.gms.base,android.support.coreutils,android.support.coreui,android.support.mediacompat,android.support.v4,com.google.android.gms.common,com.google.android.gms.auth,android.support.compat,com.google.android.gms.drive,com.google.android.play.core.client,com.google.firebase,com.google.firebase.messaging,com.google.firebase.iid,com.google.firebase.iid.internal,com.google.firebase.analytics.connector,com.google.android.gms.stats,androidx.core,androidx.fragment,androidx.legacy.coreui,androidx.legacy.coreutils,androidx.loader,androidx.viewpager,androidx.coordinatorlayout,androidx.drawerlayout,androidx.slidingpanelayout,androidx.customview,androidx.swiperefreshlayout,androidx.asynclayoutinflater,androidx.versionedparcelable,androidx.lifecycle,androidx.lifecycle.viewmodel,androidx.lifecycle.livedata,androidx.lifecycle.livedata.core,androidx.arch.core,androidx.documentfile,androidx.localbroadcastmanager,androidx.print,androidx.interpolator,androidx.cursoradapter,com.google.android.gms.cloudmessaging,com.google.firebase.datatransport,com.google.firebase.installations,com.google.firebase.installations.interop,com.google.android.datatransport.backend.cct,com.google.firebase.components,com.google.firebase.encoders.json,com.google.android.datatransport.runtime,com.google.android.datatransport" />
<!-- GCM connects to Google Services. -->
Deleted: Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/EdgeToEdgeBorder.java
===================================================================
--- Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/EdgeToEdgeBorder.java 2025-11-23 14:32:19 UTC (rev 2701)
+++ Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/EdgeToEdgeBorder.java 2025-11-23 19:44:24 UTC (rev 2702)
@@ -1,75 +0,0 @@
-package net.yura.domination.mobile.flashgui;
-
-import net.yura.domination.engine.ColorUtil;
-import net.yura.mobile.gui.DesktopPane;
-import net.yura.mobile.gui.Graphics2D;
-import net.yura.mobile.gui.border.Border;
-import net.yura.mobile.gui.border.MatteBorder;
-import net.yura.mobile.gui.components.Component;
-
-public class EdgeToEdgeBorder implements Border {
-
- private final Border border;
-
- public EdgeToEdgeBorder(Border border) {
- this.border = border;
- }
-
- public EdgeToEdgeBorder(int color) {
- MatteBorder tint = new MatteBorder(0, 0, 0, 0, color);
- tint.paintCenter = true;
- border = tint;
- }
-
- public void paintBorder(Component cmpnt, Graphics2D g, int w, int h) {
-
- DesktopPane dp = cmpnt.getDesktopPane();
- int xOnScreen = cmpnt.getXOnScreen();
- int yOnScreen = cmpnt.getYOnScreen();
- int rOnScreen = xOnScreen + w;
- int bOnScreen = yOnScreen + h;
-
- boolean fillLeft = xOnScreen == 0;
- boolean fillTop = yOnScreen == 0;
- boolean fillRight = rOnScreen == dp.getWidth();
- boolean fillBottom = bOnScreen == dp.getHeight();
-
- int clipXOnScreen = xOnScreen + g.getClipX();
- int clipYOnScreen = yOnScreen + g.getClipY();
- int clipROnScreen = clipXOnScreen + g.getClipWidth();
- int clipBOnScreen = clipYOnScreen + g.getClipHeight();
-
- int startX = (fillLeft && clipXOnScreen < 0) ? clipXOnScreen: 0;
- int startY = (fillTop && clipYOnScreen < 0) ? clipYOnScreen: 0;
- int width = ((fillRight && clipROnScreen > rOnScreen) ? clipROnScreen - xOnScreen : w) - startX;
- int height = ((fillBottom && clipBOnScreen > bOnScreen) ? clipBOnScreen - yOnScreen : h) - startY;
-
- g.translate(startX, startY);
- border.paintBorder(cmpnt, g, width, height);
- g.translate(-startX, -startY);
-
- // for debugging:
- //g.setColor(0xFFFF0000);
- //g.drawRect(startX, startY, width-1, height-1);
- }
-
- public int getTop() {
- return 0;
- }
-
- public int getBottom() {
- return 0;
- }
-
- public int getRight() {
- return 0;
- }
-
- public int getLeft() {
- return 0;
- }
-
- public boolean isBorderOpaque() {
- return border.isBorderOpaque();
- }
-}
Modified: Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/GameWindow.java
===================================================================
--- Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/GameWindow.java 2025-11-23 14:32:19 UTC (rev 2701)
+++ Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/GameWindow.java 2025-11-23 19:44:24 UTC (rev 2702)
@@ -37,6 +37,7 @@
import net.yura.mobile.gui.KeyEvent;
import net.yura.mobile.gui.Application;
import net.yura.mobile.gui.Font;
+import net.yura.mobile.gui.border.EdgeToEdgeBorder;
import net.yura.mobile.gui.components.Button;
import net.yura.mobile.gui.components.CheckBox;
import net.yura.mobile.gui.components.Component;
Modified: Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/MainMenu.java
===================================================================
--- Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/MainMenu.java 2025-11-23 14:32:19 UTC (rev 2701)
+++ Domination/sharedUI/src_mini_game_ui/net/yura/domination/mobile/flashgui/MainMenu.java 2025-11-23 19:44:24 UTC (rev 2702)
@@ -14,6 +14,7 @@
import net.yura.mobile.gui.DesktopPane;
import net.yura.mobile.gui.Application;
import net.yura.mobile.gui.border.Border;
+import net.yura.mobile.gui.border.EdgeToEdgeBorder;
import net.yura.mobile.gui.components.Button;
import net.yura.mobile.gui.components.Component;
import net.yura.mobile.gui.components.FileChooser;
|
