You can subscribe to this list here.
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(54) |
Aug
(33) |
Sep
(27) |
Oct
(10) |
Nov
|
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(7) |
Feb
(5) |
Mar
(7) |
Apr
(1) |
May
(1) |
Jun
(1) |
Jul
(25) |
Aug
(41) |
Sep
(89) |
Oct
(99) |
Nov
(161) |
Dec
(85) |
| 2010 |
Jan
(10) |
Feb
(35) |
Mar
(44) |
Apr
(115) |
May
(98) |
Jun
(87) |
Jul
(23) |
Aug
(27) |
Sep
(63) |
Oct
(57) |
Nov
(97) |
Dec
(62) |
| 2011 |
Jan
(67) |
Feb
(83) |
Mar
(43) |
Apr
(14) |
May
(43) |
Jun
(52) |
Jul
(55) |
Aug
(97) |
Sep
(65) |
Oct
(36) |
Nov
(67) |
Dec
(46) |
| 2012 |
Jan
(29) |
Feb
(24) |
Mar
(10) |
Apr
(2) |
May
(10) |
Jun
(34) |
Jul
(31) |
Aug
(9) |
Sep
(10) |
Oct
(10) |
Nov
(6) |
Dec
(7) |
| 2013 |
Jan
(1) |
Feb
(1) |
Mar
(5) |
Apr
(2) |
May
(17) |
Jun
(10) |
Jul
(8) |
Aug
(17) |
Sep
|
Oct
(3) |
Nov
(4) |
Dec
(1) |
| 2014 |
Jan
(2) |
Feb
(8) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
(5) |
Aug
(2) |
Sep
(1) |
Oct
(1) |
Nov
(5) |
Dec
(8) |
| 2015 |
Jan
(1) |
Feb
|
Mar
(4) |
Apr
|
May
(2) |
Jun
(1) |
Jul
(1) |
Aug
|
Sep
(1) |
Oct
|
Nov
(1) |
Dec
|
| 2016 |
Jan
|
Feb
(1) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(1) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
(2) |
| 2018 |
Jan
|
Feb
(2) |
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
(4) |
| 2019 |
Jan
(2) |
Feb
|
Mar
(4) |
Apr
(4) |
May
(2) |
Jun
(1) |
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
|
Dec
(4) |
| 2020 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
(1) |
Jun
(6) |
Jul
|
Aug
(1) |
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2021 |
Jan
|
Feb
(7) |
Mar
(29) |
Apr
(8) |
May
(7) |
Jun
(45) |
Jul
(66) |
Aug
|
Sep
|
Oct
(2) |
Nov
(37) |
Dec
(34) |
| 2022 |
Jan
(15) |
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
(10) |
Jul
|
Aug
|
Sep
|
Oct
(5) |
Nov
(1) |
Dec
(7) |
| 2023 |
Jan
(23) |
Feb
(18) |
Mar
(18) |
Apr
(6) |
May
(10) |
Jun
(7) |
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2024 |
Jan
(11) |
Feb
(3) |
Mar
|
Apr
(6) |
May
(3) |
Jun
|
Jul
|
Aug
(2) |
Sep
(16) |
Oct
(6) |
Nov
(7) |
Dec
(6) |
| 2025 |
Jan
(8) |
Feb
(3) |
Mar
(7) |
Apr
(5) |
May
(21) |
Jun
(10) |
Jul
(16) |
Aug
(5) |
Sep
(19) |
Oct
(2) |
Nov
|
Dec
|
|
From: <yu...@us...> - 2021-07-10 16:30:08
|
Revision: 2535
http://sourceforge.net/p/swingme/code/2535
Author: yuranet
Date: 2021-07-10 16:30:04 +0000 (Sat, 10 Jul 2021)
Log Message:
-----------
strech thumb and disabled boxes
Modified Paths:
--------------
iOSME/res/iOS_theme.xml
Modified: iOSME/res/iOS_theme.xml
===================================================================
--- iOSME/res/iOS_theme.xml 2021-07-09 22:27:19 UTC (rev 2534)
+++ iOSME/res/iOS_theme.xml 2021-07-10 16:30:04 UTC (rev 2535)
@@ -97,6 +97,7 @@
</state>
<state value="DISABLED">
<property key="icon" value="check_off_disabled"/>
+ <color type="FOREGROUND" value="#7F7F7F"/>
</state>
<state value="DISABLED AND SELECTED">
<property key="icon" value="check_on_disabled"/>
@@ -118,6 +119,7 @@
</state>
<state value="DISABLED">
<property key="icon" value="radio_off_disabled"/>
+ <color type="FOREGROUND" value="#7F7F7F"/>
</state>
<state value="DISABLED AND SELECTED">
<property key="icon" value="radio_on_disabled"/>
@@ -159,10 +161,10 @@
<style id="sliderThumb">
<insets top="13" left="12" bottom="13" right="13"/>
<state>
- <imagePainter path="/iosmeimg/handle.png" sourceInsets="13 12 13 13" />
+ <imagePainter path="/iosmeimg/handle.png" sourceInsets="13 12 13 12" />
</state>
<state value="FOCUSED">
- <imagePainter path="/iosmeimg/handle-hover.png" sourceInsets="13 12 13 13" />
+ <imagePainter path="/iosmeimg/handle-hover.png" sourceInsets="13 12 13 12" />
</state>
</style>
<bind style="sliderThumb" key="SliderThumb"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-09 22:27:22
|
Revision: 2534
http://sourceforge.net/p/swingme/code/2534
Author: yuranet
Date: 2021-07-09 22:27:19 +0000 (Fri, 09 Jul 2021)
Log Message:
-----------
default ios look for all components works
Modified Paths:
--------------
iOSME/res/iOS_theme.xml
iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java
Added Paths:
-----------
iOSME/iosmeimg/button_focus.png
iOSME/iosmeimg/select_row.png
iOSME/iosmeimg/textbox.png
iOSME/iosmeimg/textbox_focus.png
Added: iOSME/iosmeimg/button_focus.png
===================================================================
(Binary files differ)
Index: iOSME/iosmeimg/button_focus.png
===================================================================
--- iOSME/iosmeimg/button_focus.png 2021-07-09 16:16:19 UTC (rev 2533)
+++ iOSME/iosmeimg/button_focus.png 2021-07-09 22:27:19 UTC (rev 2534)
Property changes on: iOSME/iosmeimg/button_focus.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: iOSME/iosmeimg/select_row.png
===================================================================
(Binary files differ)
Index: iOSME/iosmeimg/select_row.png
===================================================================
--- iOSME/iosmeimg/select_row.png 2021-07-09 16:16:19 UTC (rev 2533)
+++ iOSME/iosmeimg/select_row.png 2021-07-09 22:27:19 UTC (rev 2534)
Property changes on: iOSME/iosmeimg/select_row.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: iOSME/iosmeimg/textbox.png
===================================================================
(Binary files differ)
Index: iOSME/iosmeimg/textbox.png
===================================================================
--- iOSME/iosmeimg/textbox.png 2021-07-09 16:16:19 UTC (rev 2533)
+++ iOSME/iosmeimg/textbox.png 2021-07-09 22:27:19 UTC (rev 2534)
Property changes on: iOSME/iosmeimg/textbox.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: iOSME/iosmeimg/textbox_focus.png
===================================================================
(Binary files differ)
Index: iOSME/iosmeimg/textbox_focus.png
===================================================================
--- iOSME/iosmeimg/textbox_focus.png 2021-07-09 16:16:19 UTC (rev 2533)
+++ iOSME/iosmeimg/textbox_focus.png 2021-07-09 22:27:19 UTC (rev 2534)
Property changes on: iOSME/iosmeimg/textbox_focus.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: iOSME/res/iOS_theme.xml
===================================================================
--- iOSME/res/iOS_theme.xml 2021-07-09 16:16:19 UTC (rev 2533)
+++ iOSME/res/iOS_theme.xml 2021-07-09 22:27:19 UTC (rev 2534)
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE synth SYSTEM "SynthME.dtd">
-
<synth>
<style id="global">
@@ -19,7 +18,6 @@
</style>
<bind style="tooltip" key="ToolTip"/>
-
<style id="button">
<insets top="5" left="5" bottom="5" right="5"/>
<state>
@@ -28,7 +26,7 @@
<color type="FOREGROUND" value="#000000"/>
</state>
<state value="FOCUSED"> <!-- top, left, bottom, right -->
- <imagePainter path="/iosmeimg/highlight.png" sourceInsets="12 10 11 10" paintCenter="false"/>
+ <imagePainter path="/iosmeimg/button_focus.png" sourceInsets="12 10 11 10" paintCenter="false"/>
<color type="BORDERFILL" value="#8f9dac"/>
</state>
<state value="DISABLED">
@@ -37,16 +35,15 @@
</style>
<bind style="button" key="Button"/>
-
<style id="text">
<insets top="3" left="6" bottom="3" right="6"/>
<state value="ENABLED">
- <imagePainter path="/iosmeimg/textbox2.png" sourceInsets="13 15 13 15" paintCenter="false"/>
+ <imagePainter path="/iosmeimg/textbox.png" sourceInsets="13 15 13 15" paintCenter="false"/>
<color type="BORDERFILL" value="#d3dae4"/>
<color type="FOREGROUND" value="#000000"/>
</state>
<state value="FOCUSED"> <!-- top, left, bottom, right -->
- <imagePainter path="/iosmeimg/textbox.png" sourceInsets="13 15 13 15" paintCenter="false"/>
+ <imagePainter path="/iosmeimg/textbox_focus.png" sourceInsets="13 15 13 15" paintCenter="false"/>
<color type="BORDERFILL" value="#ffffff"/>
<color type="FOREGROUND" value="#000000"/>
</state>
@@ -54,8 +51,6 @@
<bind style="text" key="TextField"/>
<bind style="text" key="TextArea"/>
-
-
<style id="window">
<insets top="0" left="0" bottom="0" right="0"/>
<state>
@@ -65,17 +60,15 @@
</style>
<bind style="window" key="Frame"/>
-
<style id="dialog">
- <insets top="30" left="30" bottom="30" right="30"/>
+ <insets top="15" left="15" bottom="20" right="20"/>
<state>
- <imagePainter path="/iosmeimg/dialog.png" sourceInsets="30 30 30 30" paintCenter="true"/>
+ <imagePainter path="/iosmeimg/dialog.png" sourceInsets="40 80 25 85" paintCenter="true"/>
<color type="FOREGROUND" value="#FFFFFF"/>
</state>
</style>
<bind style="dialog" key="Dialog"/>
-
<style id="dialogTitle">
<state>
<property key="titleAlignment" type="string" value="center"/>
@@ -90,16 +83,6 @@
</style>
<bind style="titleLabel" key="TitleBarLabel"/>
- <style id="menu">
- <state>
- <color type="BACKGROUND" value="#000000"/>
- <color type="FOREGROUND" value="#FFFFFF"/>
- </state>
- </style>
- <bind style="menu" key="Menu"/>
- <bind style="menu" key="Popup"/>
- <bind style="menu" key="TitleBar"/>
-
<style id="checkbox">
<insets top="5" left="5" bottom="5" right="5"/>
<imageIcon id="check_on" path="/iosmeimg/iconGrid.png" x="0" y="0" width="16" height="16"/>
@@ -121,7 +104,6 @@
</style>
<bind style="checkbox" key="CheckBox"/>
-
<style id="radioButton">
<insets top="5" left="5" bottom="5" right="5"/>
<imageIcon id="radio_on" path="/iosmeimg/iconGrid.png" x="0" y="64" width="16" height="16"/>
@@ -148,10 +130,12 @@
<state>
<imagePainter path="/iosmeimg/control_dropdown.png" sourceInsets="2 2 2 30" paintCenter="false"/>
<color type="FOREGROUND" value="#000000"/>
+ <color type="BORDERFILL" value="#ffffff"/>
</state>
<state value="FOCUSED">
<imagePainter path="/iosmeimg/control_dropdown_focus.png" sourceInsets="2 2 2 30" paintCenter="false"/>
<color type="FOREGROUND" value="#000000"/>
+ <color type="BORDERFILL" value="#ffffff"/>
</state>
</style>
<bind style="comboBox" key="ComboBox"/>
@@ -183,27 +167,39 @@
</style>
<bind style="sliderThumb" key="SliderThumb"/>
+
+
+ <style id="titleBar">
+ <state>
+ <color type="BACKGROUND" value="#000000"/>
+ <color type="FOREGROUND" value="#FFFFFF"/>
+ </state>
+ </style>
+ <bind style="titleBar" key="TitleBar"/>
+
<style id="listRenderer">
- <insets top="3" left="3" bottom="3" right="3"/>
+ <insets top="0" left="0" bottom="1" right="0"/>
<state>
<imagePainter path="/iosmeimg/select_row.png" sourceInsets="0 0 1 0" paintCenter="false"/>
- <color type="BORDERFILL" value="#FFFFFF"/>
+ <color type="BACKGROUND" value="#FFFFFF"/>
</state>
<state value="SELECTED">
- <imagePainter path="/iosmeimg/select_row.png" sourceInsets="43 0 1 0" paintCenter="false"/>
+ <imagePainter path="/iosmeimg/select_row.png" sourceInsets="42 0 1 0" paintCenter="false"/>
<color type="BORDERFILL" value="#3b78e6"/>
+ <color type="BACKGROUND" value="#00000000"/>
</state>
</style>
<bind style="listRenderer" key="ListRenderer"/>
+ <bind style="listRenderer" key="ListRendererCollapsed"/>
+ <bind style="listRenderer" key="PopupListRenderer"/>
+ <bind style="listRenderer" key="MenuRenderer"/>
-
- <style id="section">
- <insets top="5" left="5" bottom="5" right="5"/>
+ <style id="list">
<state>
- <imagePainter path="/iosmeimg/section.png" sourceInsets="12 12 12 12" paintCenter="false"/>
- <color type="BORDERFILL" value="#ffffff"/>
+ <color type="FOREGROUND" value="#000000"/>
</state>
</style>
- <bind style="section" key="Section"/>
+ <bind style="list" key="List"/>
+ <bind style="list" key="MenuBar"/>
</synth>
Modified: iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java
===================================================================
--- iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java 2021-07-09 16:16:19 UTC (rev 2533)
+++ iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java 2021-07-09 22:27:19 UTC (rev 2534)
@@ -78,7 +78,7 @@
setStyleFor("CheckBoxRenderer", checkBoxRenderer);
Style menuItem = new Style(defaultStyle);
- menuItem.addProperty(getSystemImageInWhite("chevron.right"), "arrow", Style.ALL);
+ menuItem.addProperty(new Icon(new Image(UIImage.systemImageNamed("chevron.right"))), "arrow", Style.ALL);
setStyleFor("MenuItem", menuItem);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-09 16:16:22
|
Revision: 2533
http://sourceforge.net/p/swingme/code/2533
Author: yuranet
Date: 2021-07-09 16:16:19 +0000 (Fri, 09 Jul 2021)
Log Message:
-----------
combo border fix
Modified Paths:
--------------
iOSME/res/iOS_theme.xml
Modified: iOSME/res/iOS_theme.xml
===================================================================
--- iOSME/res/iOS_theme.xml 2021-07-09 15:36:46 UTC (rev 2532)
+++ iOSME/res/iOS_theme.xml 2021-07-09 16:16:19 UTC (rev 2533)
@@ -144,13 +144,13 @@
<bind style="radioButton" key="RadioButton"/>
<style id="comboBox">
- <insets top="2" left="2" bottom="2" right="23"/>
+ <insets top="2" left="2" bottom="2" right="30"/>
<state>
- <imagePainter path="/iosmeimg/control_dropdown.png" sourceInsets="2 2 2 23" paintCenter="false"/>
+ <imagePainter path="/iosmeimg/control_dropdown.png" sourceInsets="2 2 2 30" paintCenter="false"/>
<color type="FOREGROUND" value="#000000"/>
</state>
<state value="FOCUSED">
- <imagePainter path="/iosmeimg/control_dropdown_focus.png" sourceInsets="2 2 2 23" paintCenter="false"/>
+ <imagePainter path="/iosmeimg/control_dropdown_focus.png" sourceInsets="2 2 2 30" paintCenter="false"/>
<color type="FOREGROUND" value="#000000"/>
</state>
</style>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-09 15:36:53
|
Revision: 2532
http://sourceforge.net/p/swingme/code/2532
Author: yuranet
Date: 2021-07-09 15:36:46 +0000 (Fri, 09 Jul 2021)
Log Message:
-----------
allow drawing of thinner slider track
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/Slider.java
Modified: SwingME/src/net/yura/mobile/gui/components/Slider.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Slider.java 2021-07-09 15:26:45 UTC (rev 2531)
+++ SwingME/src/net/yura/mobile/gui/components/Slider.java 2021-07-09 15:36:46 UTC (rev 2532)
@@ -382,8 +382,14 @@
protected void workoutMinimumSize() {
Border track = getTrack();
+ int thickness = (track != null) ? track.getTop() + track.getBottom() : 0;
- int thickness = (track != null) ? track.getTop() + track.getBottom() : 0;
+ Border thumb = getThumb();
+ // if we do have a track, but thumb is bigger, take size of thumb
+ if (thickness > 1 && (thumb.getTop() + thumb.getBottom()) > thickness) {
+ thickness = thumb.getTop() + thumb.getBottom();
+ }
+
if (paintTicks) {
thickness = thickness + tickSpace;
}
@@ -519,6 +525,7 @@
}
}
+ int thumbHeight = thumb == null ? 0 : thumb.getTop() + thumb.getBottom();
// DRAW ARROWS
//,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,\xF8\xA4\xBA\xB0``\xB0\xBA\xA4\xF8,\xB8\xB8,
@@ -525,9 +532,20 @@
if (track!=null) {
- g.translate(x+track.getLeft(), y+track.getTop());
- track.paintBorder(this, g, w-track.getLeft()-track.getRight(), h-track.getTop()-track.getBottom());
- g.translate(-x-track.getLeft(), -y-track.getTop());
+ int trackHeight = track.getTop() + track.getBottom();
+
+ // if the thumb is bigger then the track, just draw track in the middle
+ if (thumbHeight > trackHeight) {
+ int offset = (h - trackHeight) / 2;
+ g.translate(x + track.getLeft(), y + track.getTop() + offset);
+ track.paintBorder(this, g, w - track.getLeft() - track.getRight(), 0);
+ g.translate(-x - track.getLeft(), -y - track.getTop() - offset);
+ }
+ else {
+ g.translate(x + track.getLeft(), y + track.getTop());
+ track.paintBorder(this, g, w - track.getLeft() - track.getRight(), h - trackHeight);
+ g.translate(-x - track.getLeft(), -y - track.getTop());
+ }
/*
int x1 = x + (w-trackTop.getIconWidth())/2;
trackTop.paintIcon(this, g, x1, y);
@@ -546,11 +564,11 @@
if (thumb!=null) {
- int y1 = y + (h-thumb.getTop()-thumb.getBottom())/2;
+ int y1 = y + (h-thumbHeight)/2;
// this does the floating scrollbars
- if (y1+thumb.getTop()+thumb.getBottom() > y+h) {
- y1 = y+h -thumb.getTop()-thumb.getBottom();
+ if (y1+thumbHeight > y+h) {
+ y1 = y+h -thumbHeight;
}
g.translate(startX+thumb.getLeft(), y1+thumb.getTop());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-09 15:26:46
|
Revision: 2531
http://sourceforge.net/p/swingme/code/2531
Author: yuranet
Date: 2021-07-09 15:26:45 +0000 (Fri, 09 Jul 2021)
Log Message:
-----------
comboBox and slider themeing
Modified Paths:
--------------
iOSME/res/iOS_theme.xml
iOSME/src/javax/microedition/lcdui/Image.java
iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java
Added Paths:
-----------
iOSME/iosmeimg/bar-background.png
iOSME/iosmeimg/bar...@2x...
iOSME/iosmeimg/bar-highlight.png
iOSME/iosmeimg/bar...@2x...
iOSME/iosmeimg/control_dropdown.png
iOSME/iosmeimg/control_dropdown_focus.png
iOSME/iosmeimg/handle-hover.png
iOSME/iosmeimg/han...@2x...
iOSME/iosmeimg/handle.png
iOSME/iosmeimg/ha...@2x...
Added: iOSME/iosmeimg/bar-background.png
===================================================================
(Binary files differ)
Index: iOSME/iosmeimg/bar-background.png
===================================================================
--- iOSME/iosmeimg/bar-background.png 2021-07-09 11:51:47 UTC (rev 2530)
+++ iOSME/iosmeimg/bar-background.png 2021-07-09 15:26:45 UTC (rev 2531)
Property changes on: iOSME/iosmeimg/bar-background.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: iOSME/iosmeimg/bar...@2x...
===================================================================
(Binary files differ)
Index: iOSME/iosmeimg/bar...@2x...
===================================================================
--- iOSME/iosmeimg/bar...@2x... 2021-07-09 11:51:47 UTC (rev 2530)
+++ iOSME/iosmeimg/bar...@2x... 2021-07-09 15:26:45 UTC (rev 2531)
Property changes on: iOSME/iosmeimg/bar...@2x...
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: iOSME/iosmeimg/bar-highlight.png
===================================================================
(Binary files differ)
Index: iOSME/iosmeimg/bar-highlight.png
===================================================================
--- iOSME/iosmeimg/bar-highlight.png 2021-07-09 11:51:47 UTC (rev 2530)
+++ iOSME/iosmeimg/bar-highlight.png 2021-07-09 15:26:45 UTC (rev 2531)
Property changes on: iOSME/iosmeimg/bar-highlight.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: iOSME/iosmeimg/bar...@2x...
===================================================================
(Binary files differ)
Index: iOSME/iosmeimg/bar...@2x...
===================================================================
--- iOSME/iosmeimg/bar...@2x... 2021-07-09 11:51:47 UTC (rev 2530)
+++ iOSME/iosmeimg/bar...@2x... 2021-07-09 15:26:45 UTC (rev 2531)
Property changes on: iOSME/iosmeimg/bar...@2x...
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: iOSME/iosmeimg/control_dropdown.png
===================================================================
(Binary files differ)
Index: iOSME/iosmeimg/control_dropdown.png
===================================================================
--- iOSME/iosmeimg/control_dropdown.png 2021-07-09 11:51:47 UTC (rev 2530)
+++ iOSME/iosmeimg/control_dropdown.png 2021-07-09 15:26:45 UTC (rev 2531)
Property changes on: iOSME/iosmeimg/control_dropdown.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: iOSME/iosmeimg/control_dropdown_focus.png
===================================================================
(Binary files differ)
Index: iOSME/iosmeimg/control_dropdown_focus.png
===================================================================
--- iOSME/iosmeimg/control_dropdown_focus.png 2021-07-09 11:51:47 UTC (rev 2530)
+++ iOSME/iosmeimg/control_dropdown_focus.png 2021-07-09 15:26:45 UTC (rev 2531)
Property changes on: iOSME/iosmeimg/control_dropdown_focus.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: iOSME/iosmeimg/handle-hover.png
===================================================================
(Binary files differ)
Index: iOSME/iosmeimg/handle-hover.png
===================================================================
--- iOSME/iosmeimg/handle-hover.png 2021-07-09 11:51:47 UTC (rev 2530)
+++ iOSME/iosmeimg/handle-hover.png 2021-07-09 15:26:45 UTC (rev 2531)
Property changes on: iOSME/iosmeimg/handle-hover.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: iOSME/iosmeimg/han...@2x...
===================================================================
(Binary files differ)
Index: iOSME/iosmeimg/han...@2x...
===================================================================
--- iOSME/iosmeimg/han...@2x... 2021-07-09 11:51:47 UTC (rev 2530)
+++ iOSME/iosmeimg/han...@2x... 2021-07-09 15:26:45 UTC (rev 2531)
Property changes on: iOSME/iosmeimg/han...@2x...
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: iOSME/iosmeimg/handle.png
===================================================================
(Binary files differ)
Index: iOSME/iosmeimg/handle.png
===================================================================
--- iOSME/iosmeimg/handle.png 2021-07-09 11:51:47 UTC (rev 2530)
+++ iOSME/iosmeimg/handle.png 2021-07-09 15:26:45 UTC (rev 2531)
Property changes on: iOSME/iosmeimg/handle.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: iOSME/iosmeimg/ha...@2x...
===================================================================
(Binary files differ)
Index: iOSME/iosmeimg/ha...@2x...
===================================================================
--- iOSME/iosmeimg/ha...@2x... 2021-07-09 11:51:47 UTC (rev 2530)
+++ iOSME/iosmeimg/ha...@2x... 2021-07-09 15:26:45 UTC (rev 2531)
Property changes on: iOSME/iosmeimg/ha...@2x...
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: iOSME/res/iOS_theme.xml
===================================================================
--- iOSME/res/iOS_theme.xml 2021-07-09 11:51:47 UTC (rev 2530)
+++ iOSME/res/iOS_theme.xml 2021-07-09 15:26:45 UTC (rev 2531)
@@ -143,19 +143,46 @@
</style>
<bind style="radioButton" key="RadioButton"/>
+ <style id="comboBox">
+ <insets top="2" left="2" bottom="2" right="23"/>
+ <state>
+ <imagePainter path="/iosmeimg/control_dropdown.png" sourceInsets="2 2 2 23" paintCenter="false"/>
+ <color type="FOREGROUND" value="#000000"/>
+ </state>
+ <state value="FOCUSED">
+ <imagePainter path="/iosmeimg/control_dropdown_focus.png" sourceInsets="2 2 2 23" paintCenter="false"/>
+ <color type="FOREGROUND" value="#000000"/>
+ </state>
+ </style>
+ <bind style="comboBox" key="ComboBox"/>
-
<style id="scrollpane">
<insets top="2" left="5" bottom="2" right="5"/>
<state>
- <imagePainter method="scrollBarThumbBackground" path="/iosmeimg/thumb.png" direction="vertical" sourceInsets="2 5 2 5" />
+ <imagePainter path="/iosmeimg/thumb.png" sourceInsets="2 5 2 5" />
</state>
</style>
<bind style="scrollpane" type="region" key="ScrollBarThumb"/>
+ <style id="sliderTrack">
+ <insets top="6" left="0" bottom="5" right="0"/>
+ <state>
+ <imagePainter path="/iosmeimg/bar-background.png" sourceInsets="6 6 5 6" />
+ </state>
+ </style>
+ <bind style="sliderTrack" key="SliderTrack"/>
+ <style id="sliderThumb">
+ <insets top="13" left="12" bottom="13" right="13"/>
+ <state>
+ <imagePainter path="/iosmeimg/handle.png" sourceInsets="13 12 13 13" />
+ </state>
+ <state value="FOCUSED">
+ <imagePainter path="/iosmeimg/handle-hover.png" sourceInsets="13 12 13 13" />
+ </state>
+ </style>
+ <bind style="sliderThumb" key="SliderThumb"/>
-
<style id="listRenderer">
<insets top="3" left="3" bottom="3" right="3"/>
<state>
Modified: iOSME/src/javax/microedition/lcdui/Image.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Image.java 2021-07-09 11:51:47 UTC (rev 2530)
+++ iOSME/src/javax/microedition/lcdui/Image.java 2021-07-09 15:26:45 UTC (rev 2531)
@@ -260,7 +260,7 @@
@Override
protected void finalize() throws Throwable {
if (context != null) {
- System.out.println("WARN unused context in finalize");
+ System.out.println("WARN unused context in finalize " + this);
CoreGraphics.CGContextRelease(context);
}
super.finalize();
Modified: iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java
===================================================================
--- iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java 2021-07-09 11:51:47 UTC (rev 2530)
+++ iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java 2021-07-09 15:26:45 UTC (rev 2531)
@@ -2,6 +2,7 @@
import net.yura.mobile.gui.Icon;
import net.yura.mobile.gui.border.Border;
+import net.yura.mobile.gui.border.EmptyBorder;
import net.yura.mobile.gui.border.MatteBorder;
import net.yura.mobile.gui.plaf.Style;
import net.yura.mobile.gui.plaf.SynthLookAndFeel;
@@ -45,7 +46,7 @@
data.close();
}
catch (Exception ex) {
- throw new IllegalStateException("can not find resource files for ios theme");
+ throw new IllegalStateException("can't find synth file 'iOS_theme.xml' for ios theme");
}
//UIImage info = UIImage.systemImageNamed("info"); // info.circle info.circle.fill
@@ -55,7 +56,9 @@
//chevron.backward chevron.forward
Style defaultStyle = getStyle("");
+
Style checkBoxRenderer = new Style(defaultStyle);
+ // TODO not working checkBoxRenderer.addBorder(new EmptyBorder(20,10,20,10), Style.ALL);
Icon folderIcon = getSystemImageInWhite("folder"); // folder.fill
checkBoxRenderer.addProperty(folderIcon, "folderIcon", Style.ALL);
@@ -73,6 +76,10 @@
checkBoxRenderer.addProperty(unknownIcon, "unknownIcon", Style.ALL);
setStyleFor("CheckBoxRenderer", checkBoxRenderer);
+
+ Style menuItem = new Style(defaultStyle);
+ menuItem.addProperty(getSystemImageInWhite("chevron.right"), "arrow", Style.ALL);
+ setStyleFor("MenuItem", menuItem);
}
private static Icon getSystemImageInWhite(String name) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-09 11:51:49
|
Revision: 2530
http://sourceforge.net/p/swingme/code/2530
Author: yuranet
Date: 2021-07-09 11:51:47 +0000 (Fri, 09 Jul 2021)
Log Message:
-----------
just some system icons
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Image.java
iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java
Modified: iOSME/src/javax/microedition/lcdui/Image.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Image.java 2021-07-09 09:08:21 UTC (rev 2529)
+++ iOSME/src/javax/microedition/lcdui/Image.java 2021-07-09 11:51:47 UTC (rev 2530)
@@ -29,7 +29,7 @@
private UIImage uiImage;
private CGContextRef context;
- private Image(UIImage img) {
+ public Image(UIImage img) {
if (img == null) {
throw new NullPointerException();
}
Modified: iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java
===================================================================
--- iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java 2021-07-09 09:08:21 UTC (rev 2529)
+++ iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java 2021-07-09 11:51:47 UTC (rev 2530)
@@ -1,9 +1,13 @@
package net.yura.ios.plaf;
+import net.yura.mobile.gui.Icon;
import net.yura.mobile.gui.border.Border;
import net.yura.mobile.gui.border.MatteBorder;
+import net.yura.mobile.gui.plaf.Style;
import net.yura.mobile.gui.plaf.SynthLookAndFeel;
import java.io.InputStream;
+import javax.microedition.lcdui.Image;
+import apple.uikit.UIColor;
import apple.uikit.UIImage;
import apple.uikit.enums.UIImageResizingMode;
import apple.uikit.struct.UIEdgeInsets;
@@ -43,5 +47,37 @@
catch (Exception ex) {
throw new IllegalStateException("can not find resource files for ios theme");
}
+
+ //UIImage info = UIImage.systemImageNamed("info"); // info.circle info.circle.fill
+ //UIImage questionmark = UIImage.systemImageNamed("questionmark"); // questionmark.circle questionmark.circle.fill
+ //UIImage exclamationmark = UIImage.systemImageNamed("exclamationmark"); // exclamationmark.circle exclamationmark.circle.fill
+
+ //chevron.backward chevron.forward
+
+ Style defaultStyle = getStyle("");
+ Style checkBoxRenderer = new Style(defaultStyle);
+
+ Icon folderIcon = getSystemImageInWhite("folder"); // folder.fill
+ checkBoxRenderer.addProperty(folderIcon, "folderIcon", Style.ALL);
+
+ Icon imageIcon = getSystemImageInWhite("photo"); // photo.fill
+ checkBoxRenderer.addProperty(imageIcon, "imageIcon", Style.ALL);
+
+ Icon soundIcon = getSystemImageInWhite("speaker"); // hifispeaker.fill speaker.fill
+ checkBoxRenderer.addProperty(soundIcon, "soundIcon", Style.ALL);
+
+ Icon videoIcon = getSystemImageInWhite("video"); // film.fill video.fill
+ checkBoxRenderer.addProperty(videoIcon, "videoIcon", Style.ALL);
+
+ Icon unknownIcon = getSystemImageInWhite("doc"); // doc.fill
+ checkBoxRenderer.addProperty(unknownIcon, "unknownIcon", Style.ALL);
+
+ setStyleFor("CheckBoxRenderer", checkBoxRenderer);
}
+
+ private static Icon getSystemImageInWhite(String name) {
+ UIImage image = UIImage.systemImageNamed(name);
+ image = image.imageWithTintColor(UIColor.whiteColor());
+ return new Icon(new Image(image));
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-09 09:08:29
|
Revision: 2529
http://sourceforge.net/p/swingme/code/2529
Author: yuranet
Date: 2021-07-09 09:08:21 +0000 (Fri, 09 Jul 2021)
Log Message:
-----------
finalize check
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Image.java
Modified: iOSME/src/javax/microedition/lcdui/Image.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Image.java 2021-07-08 23:57:14 UTC (rev 2528)
+++ iOSME/src/javax/microedition/lcdui/Image.java 2021-07-09 09:08:21 UTC (rev 2529)
@@ -257,6 +257,15 @@
return uiImage;
}
+ @Override
+ protected void finalize() throws Throwable {
+ if (context != null) {
+ System.out.println("WARN unused context in finalize");
+ CoreGraphics.CGContextRelease(context);
+ }
+ super.finalize();
+ }
+
public UIImage getUIImage(int xSrc, int ySrc, int width, int height, int transform) {
UIImage start = getUIImage();
double scale = start.scale();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-08 23:57:17
|
Revision: 2528
http://sourceforge.net/p/swingme/code/2528
Author: yuranet
Date: 2021-07-08 23:57:14 +0000 (Thu, 08 Jul 2021)
Log Message:
-----------
fix for EXC_BAD_ACCESS crash
Modified Paths:
--------------
iOSME/src/javax/microedition/lcdui/Graphics.java
iOSME/src/javax/microedition/lcdui/Image.java
Modified: iOSME/src/javax/microedition/lcdui/Graphics.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Graphics.java 2021-07-08 22:30:11 UTC (rev 2527)
+++ iOSME/src/javax/microedition/lcdui/Graphics.java 2021-07-08 23:57:14 UTC (rev 2528)
@@ -457,7 +457,7 @@
// may throw NullPointerException, this is ok
if (xSrc + width > src.getWidth() || ySrc + height > src.getHeight() || width < 0 || height < 0 || xSrc < 0 || ySrc < 0) {
- throw new IllegalArgumentException("Area out of Image: "+src.getWidth()+"x"+src.getHeight()+" area: "+xSrc+","+ySrc+" "+width+"x"+height);
+ throw new IllegalArgumentException("Area out of Image: " + src.getWidth() + "x" + src.getHeight() + " area: " + xSrc + "," + ySrc + " " + width + "x" + height + " " + src);
}
if (anchor == 0) {
Modified: iOSME/src/javax/microedition/lcdui/Image.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Image.java 2021-07-08 22:30:11 UTC (rev 2527)
+++ iOSME/src/javax/microedition/lcdui/Image.java 2021-07-08 23:57:14 UTC (rev 2528)
@@ -40,6 +40,7 @@
throw new NullPointerException();
}
this.context = context;
+ CoreGraphics.CGContextRetain(context);
}
public static Image createImage(String resource) throws IOException {
@@ -218,6 +219,8 @@
// load the current image into the context
UIKit.UIGraphicsBeginImageContext(new CGSize(getWidth(), getHeight()));
context = UIKit.UIGraphicsGetCurrentContext();
+ CoreGraphics.CGContextRetain(context);
+
uiImage.drawAtPoint(CoreGraphics.CGPointZero());
}
@@ -247,6 +250,7 @@
}
UIKit.UIGraphicsEndImageContext();
+ CoreGraphics.CGContextRelease(context);
context = null;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-08 22:30:14
|
Revision: 2527
http://sourceforge.net/p/swingme/code/2527
Author: yuranet
Date: 2021-07-08 22:30:11 +0000 (Thu, 08 Jul 2021)
Log Message:
-----------
tooltip text fix
Modified Paths:
--------------
iOSME/res/iOS_theme.xml
Modified: iOSME/res/iOS_theme.xml
===================================================================
--- iOSME/res/iOS_theme.xml 2021-07-08 22:08:56 UTC (rev 2526)
+++ iOSME/res/iOS_theme.xml 2021-07-08 22:30:11 UTC (rev 2527)
@@ -13,6 +13,7 @@
<style id="tooltip">
<state>
+ <color type="FOREGROUND" value="#000000"/>
<color type="BACKGROUND" value="#FFFFFF"/>
</state>
</style>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-08 22:08:58
|
Revision: 2526
http://sourceforge.net/p/swingme/code/2526
Author: yuranet
Date: 2021-07-08 22:08:56 +0000 (Thu, 08 Jul 2021)
Log Message:
-----------
better focus control, null pointer fix
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/DesktopPane.java
SwingME/src/net/yura/mobile/gui/components/Window.java
Modified: SwingME/src/net/yura/mobile/gui/DesktopPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/DesktopPane.java 2021-07-08 16:22:23 UTC (rev 2525)
+++ SwingME/src/net/yura/mobile/gui/DesktopPane.java 2021-07-08 22:08:56 UTC (rev 2526)
@@ -1439,7 +1439,9 @@
pointerComponent.processMouseEvent(CANCEL, x, y, keypad);
pointerComponent = null;
- currentWindow.setNothingFocused();
+ if (DEFAULT_NO_FOCUS) {
+ currentWindow.setNothingFocused();
+ }
}
}
@@ -1493,7 +1495,9 @@
if (type == RELEASED || type==CANCEL) {
- currentWindow.setNothingFocused();
+ if (DEFAULT_NO_FOCUS) {
+ currentWindow.setNothingFocused();
+ }
pointerScrollPane = null;
pointerComponent = null;
Modified: SwingME/src/net/yura/mobile/gui/components/Window.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Window.java 2021-07-08 16:22:23 UTC (rev 2525)
+++ SwingME/src/net/yura/mobile/gui/components/Window.java 2021-07-08 22:08:56 UTC (rev 2526)
@@ -100,18 +100,15 @@
}
/**
- * this is a internal method, do not call this
- * on android it removes focus, other platforms it does nothing, as you can not have nothing focused on them
+ * this is a internal method, do not call this, as you can not have nothing focused on them
* @see java.awt.KeyboardFocusManager#clearGlobalFocusOwner() KeyboardFocusManager.clearGlobalFocusOwner
*/
public void setNothingFocused() {
- if (DesktopPane.getDesktopPane().DEFAULT_NO_FOCUS) {
- // we have to use mostRecentFocusOwner here as the window may have lost focus by now
- // as the button could have opened a new window, and focusOwner could be returning null
- Component f = getMostRecentFocusOwner();
- if (f!=null && !(f instanceof TextComponent)) {
- setFocusedComponent(null);
- }
+ // we have to use mostRecentFocusOwner here as the window may have lost focus by now
+ // as the button could have opened a new window, and focusOwner could be returning null
+ Component f = getMostRecentFocusOwner();
+ if (f != null && !(f instanceof TextComponent)) {
+ setFocusedComponent(null);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-08 16:22:25
|
Revision: 2525
http://sourceforge.net/p/swingme/code/2525
Author: yuranet
Date: 2021-07-08 16:22:23 +0000 (Thu, 08 Jul 2021)
Log Message:
-----------
nimbus dialog title pane fix
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java
Modified: SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java 2021-07-08 15:53:01 UTC (rev 2524)
+++ SwingME/src/net/yura/mobile/gui/plaf/nimbus/NimbusLookAndFeel.java 2021-07-08 16:22:23 UTC (rev 2525)
@@ -134,6 +134,8 @@
Border title = new NimbusBorder(titleSettings);
setUIDefault("TitleBar.border", title);
setUIDefault("TitleBar.background", noColor);
+ setUIDefault("InternalFrameTitlePane.border", title);
+ setUIDefault("InternalFrameTitlePane.background", noColor);
// MenuBar
Vector menuSettings = new Vector();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-08 15:53:03
|
Revision: 2524
http://sourceforge.net/p/swingme/code/2524
Author: yuranet
Date: 2021-07-08 15:53:01 +0000 (Thu, 08 Jul 2021)
Log Message:
-----------
can color full background of component with synth config
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/border/MatteBorder.java
SwingME/src/net/yura/mobile/gui/plaf/SynthLookAndFeel.java
Modified: SwingME/src/net/yura/mobile/gui/border/MatteBorder.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/border/MatteBorder.java 2021-07-08 12:06:30 UTC (rev 2523)
+++ SwingME/src/net/yura/mobile/gui/border/MatteBorder.java 2021-07-08 15:53:01 UTC (rev 2524)
@@ -34,14 +34,18 @@
*/
public class MatteBorder extends EmptyBorder {
- private Icon activeimage;
+ protected int color;
+ protected Icon tileIcon;
+
+ // for synth imagePainter
private int imageTop;
private int imageBottom;
private int imageRight;
private int imageLeft;
- private boolean back;
- private int color;
+ public boolean paintCenter;
+ public boolean opaque = true;
+
/**
* @param top the top inset of the border
* @param left the left inset of the border
@@ -65,8 +69,8 @@
*/
public MatteBorder(int top, int left, int bottom, int right, Icon tileIcon) {
super(top,left,bottom,right);
- activeimage = tileIcon;
- back=true;
+ this.tileIcon = tileIcon;
+ paintCenter = true;
}
@@ -204,15 +208,14 @@
}
- public boolean opaque=true;
public MatteBorder(Icon i, int top, int left, int bottom, int right, int t, int l, int b, int r, boolean back, int color) {
super(top,left,bottom,right);
- activeimage = i;
+ tileIcon = i;
imageTop=t;
imageLeft=l;
imageBottom=b;
imageRight=r;
- this.back=back;
+ this.paintCenter = back;
this.color=color;
//#mdebug debug
@@ -220,7 +223,6 @@
Logger.debug("[WARN] MatteBorder created with filling background with tiled image set to true, this should be avoided unless a textured background is needed");
}
//#enddebug
-
}
/**
@@ -228,11 +230,9 @@
* @see javax.swing.border.MatteBorder#getTileIcon() MatteBorder.getTileIcon
*/
public Icon getTileIcon() {
- return activeimage;
+ return tileIcon;
}
-
-
/**
* @param c
* @param g
@@ -242,10 +242,10 @@
*/
public void paintBorder(Component c, Graphics2D g, int width,int height) {
- if (activeimage==null) {
+ if (tileIcon ==null) {
// color can NOT be Style.NO_COLOR here
g.setColor(color);
- if (back) {
+ if (paintCenter) {
g.fillRect(-left, -top, width+left+right, height+top+bottom);
}
else {
@@ -256,7 +256,7 @@
}
}
// we will have a image, but its not loaded yet or we can not use it for some reason
- else if (activeimage.getImage() == null) {
+ else if (tileIcon.getImage() == null) {
if (color!=Style.NO_COLOR) {
g.setColor(color);
g.fillRect(-left, -top, width+left+right, height+top+bottom);
@@ -264,8 +264,8 @@
}
else {
- int imageWidth=activeimage.getIconWidth();
- int imageHeight=activeimage.getIconHeight();
+ int imageWidth = tileIcon.getIconWidth();
+ int imageHeight = tileIcon.getIconHeight();
int topDiff = imageTop-top;
int rightDiff= imageRight-right;
@@ -272,7 +272,7 @@
int leftDiff= imageLeft-left;
int bottomDiff= imageBottom-bottom;
- Image image = activeimage.getImage();
+ Image image = tileIcon.getImage();
// on blackberry we can not draw a image of 0 width or 0 height, so we have to check
if (imageTop>0) {
@@ -304,15 +304,14 @@
g.drawImage(image,imageWidth-imageRight,imageTop,imageRight,imageHeight-imageTop-imageBottom,
width-rightDiff,topDiff,imageRight,height-topDiff-bottomDiff); // right
- if (!back && color==Style.NO_COLOR) {
+ if (!paintCenter && color == Style.NO_COLOR) {
// TODO matte tileing the border with the whole image
// check that if there is NO bckground that the Diff values are not negative
// as if they r negative we need to fill in those aras
}
+ else if (paintCenter) {
- else if (back) {
-
int src_w = imageWidth-imageRight-imageLeft;
int src_h = imageHeight-imageTop-imageBottom;
int dist_w = width-leftDiff-rightDiff;
@@ -326,7 +325,6 @@
g.drawImage(image,imageLeft,imageTop,src_w,src_h,leftDiff,topDiff,dist_w,dist_h); // centre
}
}
-
else if (color!=Style.NO_COLOR) {
boolean fillsides = (imageHeight-imageTop-imageBottom) == 0;
boolean filltop = (imageWidth-imageRight-imageLeft) == 0;
@@ -333,7 +331,6 @@
g.setColor(color);
g.fillRect(fillsides?-left:leftDiff,filltop?-top:topDiff,width-(fillsides?-(left+right):leftDiff+rightDiff),height-(filltop?-(top+bottom):topDiff+bottomDiff));
}
-
//#mdebug info
else {
Logger.info("imagePainter has image but does not have anything to fill the area, this is prob bad");
@@ -351,12 +348,10 @@
}
//#enddebug
}
-
}
-
public boolean isBorderOpaque() {
- return opaque && (back || (activeimage!=null && Graphics2D.isOpaque(color) ) );
+ return opaque && (paintCenter || (tileIcon !=null && Graphics2D.isOpaque(color) ) );
}
public void setColor(int c) {
Modified: SwingME/src/net/yura/mobile/gui/plaf/SynthLookAndFeel.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/plaf/SynthLookAndFeel.java 2021-07-08 12:06:30 UTC (rev 2523)
+++ SwingME/src/net/yura/mobile/gui/plaf/SynthLookAndFeel.java 2021-07-08 15:53:01 UTC (rev 2524)
@@ -312,6 +312,13 @@
}
}
+ if (borderfill != Style.NO_COLOR && border == null) {
+ Border sourceInsets = insets == null ? Component.empty : insets;
+ border = new MatteBorder(sourceInsets.getTop(), sourceInsets.getLeft(), sourceInsets.getBottom(), sourceInsets.getRight(), borderfill);
+ ((MatteBorder) border).paintCenter = true;
+ ((MatteBorder) border).opaque = Graphics2D.isOpaque(borderfill);
+ newStyle.addBorder(border, st);
+ }
}
else if ("font".equals(name)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-08 12:06:31
|
Revision: 2523
http://sourceforge.net/p/swingme/code/2523
Author: yuranet
Date: 2021-07-08 12:06:30 +0000 (Thu, 08 Jul 2021)
Log Message:
-----------
disabled buttons
Modified Paths:
--------------
iOSME/res/iOS_theme.xml
Modified: iOSME/res/iOS_theme.xml
===================================================================
--- iOSME/res/iOS_theme.xml 2021-07-08 11:52:03 UTC (rev 2522)
+++ iOSME/res/iOS_theme.xml 2021-07-08 12:06:30 UTC (rev 2523)
@@ -30,6 +30,9 @@
<imagePainter path="/iosmeimg/highlight.png" sourceInsets="12 10 11 10" paintCenter="false"/>
<color type="BORDERFILL" value="#8f9dac"/>
</state>
+ <state value="DISABLED">
+ <color type="FOREGROUND" value="#808080"/>
+ </state>
</style>
<bind style="button" key="Button"/>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-08 11:52:10
|
Revision: 2522
http://sourceforge.net/p/swingme/code/2522
Author: yuranet
Date: 2021-07-08 11:52:03 +0000 (Thu, 08 Jul 2021)
Log Message:
-----------
default ios theme
Modified Paths:
--------------
iOSME/src/android/graphics/ColorMatrix.java
iOSME/src/javax/microedition/lcdui/Graphics.java
iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java
Added Paths:
-----------
iOSME/iosmeimg/
iOSME/iosmeimg/button.png
iOSME/iosmeimg/dialog.png
iOSME/iosmeimg/iconGrid.png
iOSME/iosmeimg/thumb.png
iOSME/res/
iOSME/res/iOS_theme.xml
Added: iOSME/iosmeimg/button.png
===================================================================
(Binary files differ)
Index: iOSME/iosmeimg/button.png
===================================================================
--- iOSME/iosmeimg/button.png 2021-07-08 11:48:20 UTC (rev 2521)
+++ iOSME/iosmeimg/button.png 2021-07-08 11:52:03 UTC (rev 2522)
Property changes on: iOSME/iosmeimg/button.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: iOSME/iosmeimg/dialog.png
===================================================================
(Binary files differ)
Index: iOSME/iosmeimg/dialog.png
===================================================================
--- iOSME/iosmeimg/dialog.png 2021-07-08 11:48:20 UTC (rev 2521)
+++ iOSME/iosmeimg/dialog.png 2021-07-08 11:52:03 UTC (rev 2522)
Property changes on: iOSME/iosmeimg/dialog.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: iOSME/iosmeimg/iconGrid.png
===================================================================
(Binary files differ)
Index: iOSME/iosmeimg/iconGrid.png
===================================================================
--- iOSME/iosmeimg/iconGrid.png 2021-07-08 11:48:20 UTC (rev 2521)
+++ iOSME/iosmeimg/iconGrid.png 2021-07-08 11:52:03 UTC (rev 2522)
Property changes on: iOSME/iosmeimg/iconGrid.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: iOSME/iosmeimg/thumb.png
===================================================================
(Binary files differ)
Index: iOSME/iosmeimg/thumb.png
===================================================================
--- iOSME/iosmeimg/thumb.png 2021-07-08 11:48:20 UTC (rev 2521)
+++ iOSME/iosmeimg/thumb.png 2021-07-08 11:52:03 UTC (rev 2522)
Property changes on: iOSME/iosmeimg/thumb.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: iOSME/res/iOS_theme.xml
===================================================================
--- iOSME/res/iOS_theme.xml (rev 0)
+++ iOSME/res/iOS_theme.xml 2021-07-08 11:52:03 UTC (rev 2522)
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE synth SYSTEM "SynthME.dtd">
+
+<synth>
+
+ <style id="global">
+ <state>
+ <font name="PROPORTIONAL" size="MEDIUM"/>
+ <!-- do not set default foreground as we want the component to get it from the window -->
+ </state>
+ </style>
+ <bind style="global" key=".*"/>
+
+ <style id="tooltip">
+ <state>
+ <color type="BACKGROUND" value="#FFFFFF"/>
+ </state>
+ </style>
+ <bind style="tooltip" key="ToolTip"/>
+
+
+ <style id="button">
+ <insets top="5" left="5" bottom="5" right="5"/>
+ <state>
+ <imagePainter path="/iosmeimg/button.png" sourceInsets="12 10 11 10" paintCenter="false"/>
+ <color type="BORDERFILL" value="#d6d6d6"/>
+ <color type="FOREGROUND" value="#000000"/>
+ </state>
+ <state value="FOCUSED"> <!-- top, left, bottom, right -->
+ <imagePainter path="/iosmeimg/highlight.png" sourceInsets="12 10 11 10" paintCenter="false"/>
+ <color type="BORDERFILL" value="#8f9dac"/>
+ </state>
+ </style>
+ <bind style="button" key="Button"/>
+
+
+ <style id="text">
+ <insets top="3" left="6" bottom="3" right="6"/>
+ <state value="ENABLED">
+ <imagePainter path="/iosmeimg/textbox2.png" sourceInsets="13 15 13 15" paintCenter="false"/>
+ <color type="BORDERFILL" value="#d3dae4"/>
+ <color type="FOREGROUND" value="#000000"/>
+ </state>
+ <state value="FOCUSED"> <!-- top, left, bottom, right -->
+ <imagePainter path="/iosmeimg/textbox.png" sourceInsets="13 15 13 15" paintCenter="false"/>
+ <color type="BORDERFILL" value="#ffffff"/>
+ <color type="FOREGROUND" value="#000000"/>
+ </state>
+ </style>
+ <bind style="text" key="TextField"/>
+ <bind style="text" key="TextArea"/>
+
+
+
+ <style id="window">
+ <insets top="0" left="0" bottom="0" right="0"/>
+ <state>
+ <color type="BACKGROUND" value="#F2F2F7"/>
+ <color type="FOREGROUND" value="#52425c"/>
+ </state>
+ </style>
+ <bind style="window" key="Frame"/>
+
+
+ <style id="dialog">
+ <insets top="30" left="30" bottom="30" right="30"/>
+ <state>
+ <imagePainter path="/iosmeimg/dialog.png" sourceInsets="30 30 30 30" paintCenter="true"/>
+ <color type="FOREGROUND" value="#FFFFFF"/>
+ </state>
+ </style>
+ <bind style="dialog" key="Dialog"/>
+
+
+ <style id="dialogTitle">
+ <state>
+ <property key="titleAlignment" type="string" value="center"/>
+ </state>
+ </style>
+ <bind style="dialogTitle" key="InternalFrameTitlePane"/>
+
+ <style id="titleLabel">
+ <state>
+ <font name="PROPORTIONAL" size="MEDIUM" style="BOLD"/>
+ </state>
+ </style>
+ <bind style="titleLabel" key="TitleBarLabel"/>
+
+ <style id="menu">
+ <state>
+ <color type="BACKGROUND" value="#000000"/>
+ <color type="FOREGROUND" value="#FFFFFF"/>
+ </state>
+ </style>
+ <bind style="menu" key="Menu"/>
+ <bind style="menu" key="Popup"/>
+ <bind style="menu" key="TitleBar"/>
+
+ <style id="checkbox">
+ <insets top="5" left="5" bottom="5" right="5"/>
+ <imageIcon id="check_on" path="/iosmeimg/iconGrid.png" x="0" y="0" width="16" height="16"/>
+ <imageIcon id="check_on_disabled" path="/iosmeimg/iconGrid.png" x="0" y="16" width="16" height="16"/>
+ <imageIcon id="check_off" path="/iosmeimg/iconGrid.png" x="0" y="32" width="16" height="16"/>
+ <imageIcon id="check_off_disabled" path="/iosmeimg/iconGrid.png" x="0" y="48" width="16" height="16"/>
+ <state>
+ <property key="icon" value="check_off"/>
+ </state>
+ <state value="SELECTED">
+ <property key="icon" value="check_on"/>
+ </state>
+ <state value="DISABLED">
+ <property key="icon" value="check_off_disabled"/>
+ </state>
+ <state value="DISABLED AND SELECTED">
+ <property key="icon" value="check_on_disabled"/>
+ </state>
+ </style>
+ <bind style="checkbox" key="CheckBox"/>
+
+
+ <style id="radioButton">
+ <insets top="5" left="5" bottom="5" right="5"/>
+ <imageIcon id="radio_on" path="/iosmeimg/iconGrid.png" x="0" y="64" width="16" height="16"/>
+ <imageIcon id="radio_on_disabled" path="/iosmeimg/iconGrid.png" x="0" y="80" width="16" height="16"/>
+ <imageIcon id="radio_off" path="/iosmeimg/iconGrid.png" x="0" y="96" width="16" height="16"/>
+ <imageIcon id="radio_off_disabled" path="/iosmeimg/iconGrid.png" x="0" y="112" width="16" height="16"/>
+ <state>
+ <property key="icon" value="radio_off"/>
+ </state>
+ <state value="SELECTED">
+ <property key="icon" value="radio_on"/>
+ </state>
+ <state value="DISABLED">
+ <property key="icon" value="radio_off_disabled"/>
+ </state>
+ <state value="DISABLED AND SELECTED">
+ <property key="icon" value="radio_on_disabled"/>
+ </state>
+ </style>
+ <bind style="radioButton" key="RadioButton"/>
+
+
+
+ <style id="scrollpane">
+ <insets top="2" left="5" bottom="2" right="5"/>
+ <state>
+ <imagePainter method="scrollBarThumbBackground" path="/iosmeimg/thumb.png" direction="vertical" sourceInsets="2 5 2 5" />
+ </state>
+ </style>
+ <bind style="scrollpane" type="region" key="ScrollBarThumb"/>
+
+
+
+
+ <style id="listRenderer">
+ <insets top="3" left="3" bottom="3" right="3"/>
+ <state>
+ <imagePainter path="/iosmeimg/select_row.png" sourceInsets="0 0 1 0" paintCenter="false"/>
+ <color type="BORDERFILL" value="#FFFFFF"/>
+ </state>
+ <state value="SELECTED">
+ <imagePainter path="/iosmeimg/select_row.png" sourceInsets="43 0 1 0" paintCenter="false"/>
+ <color type="BORDERFILL" value="#3b78e6"/>
+ </state>
+ </style>
+ <bind style="listRenderer" key="ListRenderer"/>
+
+
+ <style id="section">
+ <insets top="5" left="5" bottom="5" right="5"/>
+ <state>
+ <imagePainter path="/iosmeimg/section.png" sourceInsets="12 12 12 12" paintCenter="false"/>
+ <color type="BORDERFILL" value="#ffffff"/>
+ </state>
+ </style>
+ <bind style="section" key="Section"/>
+
+</synth>
Modified: iOSME/src/android/graphics/ColorMatrix.java
===================================================================
--- iOSME/src/android/graphics/ColorMatrix.java 2021-07-08 11:48:20 UTC (rev 2521)
+++ iOSME/src/android/graphics/ColorMatrix.java 2021-07-08 11:52:03 UTC (rev 2522)
@@ -176,6 +176,9 @@
return true;
}
+ /**
+ * convert android ColorMatrix into iOS CIColorMatrix
+ */
public CIFilter toCIFilter() {
CIFilter filter = CIFilter.filterWithName("CIColorMatrix");
Modified: iOSME/src/javax/microedition/lcdui/Graphics.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Graphics.java 2021-07-08 11:48:20 UTC (rev 2521)
+++ iOSME/src/javax/microedition/lcdui/Graphics.java 2021-07-08 11:52:03 UTC (rev 2522)
@@ -45,7 +45,7 @@
private int tx, ty;
private int strokeWidth = 1, strokeStyle;
- // Get clipBounds is slow, we keep a cache.
+ // we keep a cache.
private CGRect clipBounds = new CGRect();
private boolean dirtyClip = true;
@@ -127,6 +127,8 @@
public void setStrokeStyle(int stroke) {
this.strokeStyle = stroke;
+ // TODO CoreGraphics.CGContextSetStrokePattern(context, pattern, components);
+ // TODO CoreGraphics.CGContextSetLineDash(context, );
}
public int getStrokeStyle() {
Modified: iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java
===================================================================
--- iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java 2021-07-08 11:48:20 UTC (rev 2521)
+++ iOSME/src/net/yura/ios/plaf/IOSLookAndFeel.java 2021-07-08 11:52:03 UTC (rev 2522)
@@ -1,11 +1,9 @@
package net.yura.ios.plaf;
-import net.yura.mobile.gui.Icon;
import net.yura.mobile.gui.border.Border;
import net.yura.mobile.gui.border.MatteBorder;
import net.yura.mobile.gui.plaf.SynthLookAndFeel;
import java.io.InputStream;
-import javax.microedition.lcdui.Image;
import apple.uikit.UIImage;
import apple.uikit.enums.UIImageResizingMode;
import apple.uikit.struct.UIEdgeInsets;
@@ -28,6 +26,7 @@
if (border instanceof MatteBorder) {
MatteBorder ninePatch = (MatteBorder) border;
UIImage orgImg = ninePatch.getTileIcon().getImage().getUIImage();
+ // TODO what if 'ninePatch.back' (draw center background) is false?
int[] insets = ninePatch.getImageEdgeInsets();
UIImage borderImg = orgImg.resizableImageWithCapInsetsResizingMode(new UIEdgeInsets(insets[0], insets[1], insets[2], insets[3]), UIImageResizingMode.Stretch);
return new IOSBorder(borderImg, ninePatch.getTop(), ninePatch.getLeft(), ninePatch.getBottom(), ninePatch.getRight());
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-08 11:48:22
|
Revision: 2521
http://sourceforge.net/p/swingme/code/2521
Author: yuranet
Date: 2021-07-08 11:48:20 +0000 (Thu, 08 Jul 2021)
Log Message:
-----------
more info in logging
Modified Paths:
--------------
AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java
Modified: AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java
===================================================================
--- AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java 2021-07-08 11:45:28 UTC (rev 2520)
+++ AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java 2021-07-08 11:48:20 UTC (rev 2521)
@@ -55,7 +55,7 @@
int systemDensity = Image.getTargetDensity();
int bitmapDensity = bmp.getDensity();
if (bitmapDensity == Bitmap.DENSITY_NONE) {
- System.err.println("WARN no density for image " + path);
+ System.err.println("WARN no density for image " + path + " (" + bmp.getWidth() + "x" + bmp.getHeight() + ")");
bitmapDensity = DisplayMetrics.DENSITY_DEFAULT; // default to make numbers smaller, as less likely to cause a crash
}
double scale = (double) bitmapDensity / (double) systemDensity;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-08 11:45:34
|
Revision: 2520
http://sourceforge.net/p/swingme/code/2520
Author: yuranet
Date: 2021-07-08 11:45:28 +0000 (Thu, 08 Jul 2021)
Log Message:
-----------
synth auto scales sizes now
Modified Paths:
--------------
AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidIcon.java
AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java
Modified: AndroidME/src_MIDP/javax/microedition/lcdui/Image.java
===================================================================
--- AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2021-07-08 11:37:52 UTC (rev 2519)
+++ AndroidME/src_MIDP/javax/microedition/lcdui/Image.java 2021-07-08 11:45:28 UTC (rev 2520)
@@ -281,7 +281,7 @@
* @see android.graphics.drawable.BitmapDrawable#updateLocalState(Resources)
* @see android.graphics.drawable.Drawable#resolveDensity(Resources, int)
*/
- static int getTargetDensity() {
+ public static int getTargetDensity() {
// on API-29 this returns total rubbish, even on the emulator (display.dpi=480 display.stableDensity=320)
//if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
//return DisplayMetrics.DENSITY_DEVICE_STABLE;
Modified: AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidIcon.java
===================================================================
--- AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidIcon.java 2021-07-08 11:37:52 UTC (rev 2519)
+++ AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidIcon.java 2021-07-08 11:45:28 UTC (rev 2520)
@@ -14,10 +14,8 @@
* You should have received a copy of the GNU Lesser General Public License
* along with 'yura.net Swing ME'. If not, see <http://www.gnu.org/licenses/>.
*/
-
package net.yura.android.plaf;
-
import android.graphics.drawable.Drawable;
import net.yura.mobile.gui.Graphics2D;
import net.yura.mobile.gui.Icon;
Modified: AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java
===================================================================
--- AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java 2021-07-08 11:37:52 UTC (rev 2519)
+++ AndroidME/src_SwingME_plaf/net/yura/android/plaf/AndroidLookAndFeel.java 2021-07-08 11:45:28 UTC (rev 2520)
@@ -47,20 +47,22 @@
protected Icon getIcon(String path, int x, int y, int w, int h) {
Image.ResourceInputStream resimg = Image.getResourceAsStream(path);
if (resimg!=null) {
- Drawable bmpd = resimg.getDrawable();
- if (bmpd!=null) { // this should NEVER be null, but sometimes it is
+ Drawable bitmapDrawable = resimg.getDrawable();
+ if (bitmapDrawable!=null) { // this should NEVER be null, but sometimes it is
if (w!=0 && h !=0) {
// TODO maybe can be done better to not need a new bitmap
- Bitmap bmp = ((BitmapDrawable)bmpd).getBitmap();
- double density = bmp.getDensity();
- if (density == Bitmap.DENSITY_NONE) {
- density = AndroidMeActivity.DEFAULT_ACTIVITY.getResources().getDisplayMetrics().densityDpi;
+ Bitmap bmp = ((BitmapDrawable)bitmapDrawable).getBitmap();
+ int systemDensity = Image.getTargetDensity();
+ int bitmapDensity = bmp.getDensity();
+ if (bitmapDensity == Bitmap.DENSITY_NONE) {
+ System.err.println("WARN no density for image " + path);
+ bitmapDensity = DisplayMetrics.DENSITY_DEFAULT; // default to make numbers smaller, as less likely to cause a crash
}
- double scale = density / DisplayMetrics.DENSITY_DEFAULT;
- bmp = Bitmap.createBitmap(bmp, (int)(x*scale), (int)(y*scale), (int)(w*scale), (int)(h*scale) );
- bmpd = new BitmapDrawable( AndroidMeApp.getContext().getResources() ,bmp);
+ double scale = (double) bitmapDensity / (double) systemDensity;
+ bmp = Bitmap.createBitmap(bmp, (int) (x * scale), (int) (y * scale), (int) (w * scale), (int) (h * scale));
+ bitmapDrawable = new BitmapDrawable(AndroidMeApp.getContext().getResources(), bmp);
}
- return new AndroidIcon( bmpd );
+ return new AndroidIcon(bitmapDrawable);
}
else {
System.err.println("getDrawable returned null for "+path+" "+resimg);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-08 11:37:55
|
Revision: 2519
http://sourceforge.net/p/swingme/code/2519
Author: yuranet
Date: 2021-07-08 11:37:52 +0000 (Thu, 08 Jul 2021)
Log Message:
-----------
scale all values when loading synth file so we only need 1 file for all resolutions
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/OptionPane.java
SwingME/src/net/yura/mobile/gui/plaf/SynthLookAndFeel.java
Modified: SwingME/src/net/yura/mobile/gui/components/OptionPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/OptionPane.java 2021-07-08 00:32:17 UTC (rev 2518)
+++ SwingME/src/net/yura/mobile/gui/components/OptionPane.java 2021-07-08 11:37:52 UTC (rev 2519)
@@ -102,7 +102,6 @@
*/
public OptionPane() {
-
for (int c=0;c<allWindows.size();c++) {
if (((WeakReference)allWindows.elementAt(c)).get() == null) {
allWindows.removeElementAt(c);
@@ -111,8 +110,8 @@
}
allWindows.addElement(new WeakReference(this));
-
setName("Dialog");
+ getTitlePane().setName("InternalFrameTitlePane"); // to differentiate from main window title bars, (same name as in Swing)
setMaximizable(false);
Modified: SwingME/src/net/yura/mobile/gui/plaf/SynthLookAndFeel.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/plaf/SynthLookAndFeel.java 2021-07-08 00:32:17 UTC (rev 2518)
+++ SwingME/src/net/yura/mobile/gui/plaf/SynthLookAndFeel.java 2021-07-08 11:37:52 UTC (rev 2519)
@@ -30,6 +30,7 @@
import net.yura.mobile.gui.border.EmptyBorder;
import net.yura.mobile.gui.border.MatteBorder;
import net.yura.mobile.gui.components.Component;
+import net.yura.mobile.gui.layout.XULLoader;
import net.yura.mobile.logging.Logger;
import net.yura.mobile.util.StringUtil;
import net.yura.mobile.io.kxml2.KXmlParser;
@@ -206,9 +207,14 @@
if (sourceInsets!=null) {
String[] split = StringUtil.split(sourceInsets, ' ');
+
+ int t = XULLoader.adjustSizeToDensity(Integer.parseInt(split[0]));
+ int l = XULLoader.adjustSizeToDensity(Integer.parseInt(split[1]));
+ int b = XULLoader.adjustSizeToDensity(Integer.parseInt(split[2]));
+ int r = XULLoader.adjustSizeToDensity(Integer.parseInt(split[3]));
+
border = getBorder(path, insets == null ? 0 : insets.getTop(), insets == null ? 0 : insets.getLeft(), insets == null ? 0 : insets.getBottom(), insets == null ? 0 : insets.getRight(),
- Integer.parseInt(split[0]), Integer.parseInt(split[1]), Integer.parseInt(split[2]), Integer.parseInt(split[3]),
- "true".equals(paintCenter) || "Y".equals(paintCenter), borderfill);
+ t, l, b, r, "true".equals(paintCenter) || "Y".equals(paintCenter), borderfill);
if (border != null) {
if (border instanceof MatteBorder) {
((MatteBorder)border).opaque = opaque;
@@ -319,7 +325,12 @@
String bottom = parser.getAttributeValue(null, "bottom");
String right = parser.getAttributeValue(null, "right");
- insets = new EmptyBorder(Integer.parseInt(top), Integer.parseInt(left), Integer.parseInt(bottom), Integer.parseInt(right));
+ int t = XULLoader.adjustSizeToDensity(Integer.parseInt(top));
+ int l = XULLoader.adjustSizeToDensity(Integer.parseInt(left));
+ int b = XULLoader.adjustSizeToDensity(Integer.parseInt(bottom));
+ int r = XULLoader.adjustSizeToDensity(Integer.parseInt(right));
+
+ insets = new EmptyBorder(t, l, b, r);
newStyle.addBorder(insets, Style.ALL);
}
else if ("imageIcon".equals(name)) {
@@ -337,27 +348,29 @@
if (frameWidth!=null || frameHeight!=null) {
Image img = createImage(path);
if (img!=null) {
- newImage = new Sprite(img, frameWidth==null?img.getWidth():Integer.parseInt(frameWidth), frameHeight==null?img.getHeight():Integer.parseInt(frameHeight));
+ int w = frameWidth == null ? img.getWidth() : XULLoader.adjustSizeToDensity(Integer.parseInt(frameWidth));
+ int h = frameHeight == null ? img.getHeight() : XULLoader.adjustSizeToDensity(Integer.parseInt(frameHeight));
+ newImage = new Sprite(img, w, h);
}
}
else {
- // TODO: the image may come back as xhdpi and have a higher resolution, but the x,y,w,h are not being scaled
- newImage = getIcon( path,x==null?0:Integer.parseInt(x),y==null?0:Integer.parseInt(y),width==null?0:Integer.parseInt(width),height==null?0:Integer.parseInt(height) );
+ int xpos = x == null ? 0 : XULLoader.adjustSizeToDensity(Integer.parseInt(x));
+ int ypos = y == null ? 0 : XULLoader.adjustSizeToDensity(Integer.parseInt(y));
+ int w = width == null ? 0 : XULLoader.adjustSizeToDensity(Integer.parseInt(width));
+ int h = height == null ? 0 : XULLoader.adjustSizeToDensity(Integer.parseInt(height));
+
+ newImage = getIcon(path, xpos, ypos, w, h);
}
if (newImage!=null) {
- params.put(id, newImage );
+ params.put(id, newImage);
}
}
else if ("opaque".equals(name)) {
-
String value = parser.getAttributeValue(null, "value");
-
opaque = !"false".equals(value);
-
if (!opaque) { // if it is transparent!
newStyle.addBackground(Style.NO_COLOR, Style.ALL);
}
-
}
else {
//#debug warn
@@ -367,21 +380,19 @@
// read end tag
parser.skipSubTree();
}
-
}
return newStyle;
-
}
private int workOutState(String value) {
-
int result=Style.ALL;
if (value==null) {
return result;
}
+ // we handle ENABLED state by adding empty values to DISABLED state
// if (value.indexOf("ENABLED")!=-1) {
// result |= Style.ENABLED;
// }
@@ -396,7 +407,6 @@
}
return result;
-
}
// TODO: support bitmap fonts
@@ -497,7 +507,6 @@
}
return font;
-
}
public static int getFontName(String fontName) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-08 00:32:19
|
Revision: 2518
http://sourceforge.net/p/swingme/code/2518
Author: yuranet
Date: 2021-07-08 00:32:17 +0000 (Thu, 08 Jul 2021)
Log Message:
-----------
support enabled only painters
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/plaf/SynthLookAndFeel.java
Modified: SwingME/src/net/yura/mobile/gui/plaf/SynthLookAndFeel.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/plaf/SynthLookAndFeel.java 2021-07-07 14:42:35 UTC (rev 2517)
+++ SwingME/src/net/yura/mobile/gui/plaf/SynthLookAndFeel.java 2021-07-08 00:32:17 UTC (rev 2518)
@@ -29,6 +29,7 @@
import net.yura.mobile.gui.border.Border;
import net.yura.mobile.gui.border.EmptyBorder;
import net.yura.mobile.gui.border.MatteBorder;
+import net.yura.mobile.gui.components.Component;
import net.yura.mobile.logging.Logger;
import net.yura.mobile.util.StringUtil;
import net.yura.mobile.io.kxml2.KXmlParser;
@@ -175,8 +176,16 @@
if ("state".equals(name)) {
- int st = workOutState( parser.getAttributeValue(null, "value") );
+ String stateValue = parser.getAttributeValue(null, "value");
+ int st = workOutState(stateValue);
+ // if ENABLED is specified, we want it to apply to all but disabled, so we add fallthrough disabled defaults
+ if (stateValue != null && stateValue.indexOf("ENABLED") != -1) {
+ newStyle.addBorder(insets == null ? Component.empty : insets, Style.DISABLED);
+ newStyle.addForeground(Style.NO_COLOR, Style.DISABLED);
+ newStyle.addBackground(Style.NO_COLOR, Style.DISABLED);
+ }
+
// vars local to this state
int borderfill=Style.NO_COLOR;
Border border = null;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-07 14:42:37
|
Revision: 2517
http://sourceforge.net/p/swingme/code/2517
Author: yuranet
Date: 2021-07-07 14:42:35 +0000 (Wed, 07 Jul 2021)
Log Message:
-----------
take insets into account for option pane text areas
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/components/OptionPane.java
Modified: SwingME/src/net/yura/mobile/gui/components/OptionPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/OptionPane.java 2021-07-07 10:48:48 UTC (rev 2516)
+++ SwingME/src/net/yura/mobile/gui/components/OptionPane.java 2021-07-07 14:42:35 UTC (rev 2517)
@@ -25,6 +25,7 @@
import net.yura.mobile.gui.DesktopPane;
import net.yura.mobile.gui.Icon;
import net.yura.mobile.gui.KeyEvent;
+import net.yura.mobile.gui.border.Border;
import net.yura.mobile.gui.layout.BoxLayout;
import net.yura.mobile.gui.layout.FlowLayout;
import net.yura.mobile.gui.layout.GridBagConstraints;
@@ -228,7 +229,8 @@
}
- int space = dp.getWidth() - 12 - scroll.getBarThickness(); // padding
+ Border dialogInsets = getInsets();
+ int space = dp.getWidth() - 12 - scroll.getBarThickness() - dialogInsets.getLeft() - dialogInsets.getRight(); // padding
if (dp.VERY_BIG_SCREEN) {
icon.workoutPreferredSize();
space = space - icon.getWidthWithBorder();
@@ -239,7 +241,8 @@
if (txt.startsWith("<html>")) {
TextPane tp = new TextPane();
tp.setText(txt);
- tp.setPreferredSize(space, -1);
+ Border tpInsets = tp.getInsets();
+ tp.setPreferredSize(space - tpInsets.getLeft() - tpInsets.getRight(), -1);
return tp;
}
@@ -257,7 +260,10 @@
tmp2.setLineWrap(true);
tmp2.setFocusable(false);
tmp2.setText(txt);
- tmp2.setPreferredSize( space, -1 );
+
+ Border taInsets = tmp2.getInsets();
+
+ tmp2.setPreferredSize(space - taInsets.getLeft() - taInsets.getRight(), -1 );
return tmp2;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-07 10:48:51
|
Revision: 2516
http://sourceforge.net/p/swingme/code/2516
Author: yuranet
Date: 2021-07-07 10:48:48 +0000 (Wed, 07 Jul 2021)
Log Message:
-----------
better class name
Modified Paths:
--------------
iOSME/src/javax/microedition/amms/GlobalManager.java
Added Paths:
-----------
iOSME/src/net/yura/ios/iOSImageEncoder.java
Removed Paths:
-------------
iOSME/src/net/yura/ios/iOSJpegEncoder.java
Modified: iOSME/src/javax/microedition/amms/GlobalManager.java
===================================================================
--- iOSME/src/javax/microedition/amms/GlobalManager.java 2021-07-07 09:51:40 UTC (rev 2515)
+++ iOSME/src/javax/microedition/amms/GlobalManager.java 2021-07-07 10:48:48 UTC (rev 2516)
@@ -1,11 +1,11 @@
package javax.microedition.amms;
-import net.yura.ios.iOSJpegEncoder;
+import net.yura.ios.iOSImageEncoder;
public class GlobalManager {
public static MediaProcessor createMediaProcessor(String string) {
if ("image/raw".equals(string)) {
- return new iOSJpegEncoder();
+ return new iOSImageEncoder();
}
throw new RuntimeException();
}
Copied: iOSME/src/net/yura/ios/iOSImageEncoder.java (from rev 2515, iOSME/src/net/yura/ios/iOSJpegEncoder.java)
===================================================================
--- iOSME/src/net/yura/ios/iOSImageEncoder.java (rev 0)
+++ iOSME/src/net/yura/ios/iOSImageEncoder.java 2021-07-07 10:48:48 UTC (rev 2516)
@@ -0,0 +1,68 @@
+package net.yura.ios;
+
+import java.io.OutputStream;
+import javax.microedition.amms.MediaProcessor;
+import javax.microedition.amms.control.ImageFormatControl;
+import javax.microedition.lcdui.Image;
+import javax.microedition.media.Control;
+import javax.microedition.media.MediaException;
+import apple.foundation.NSData;
+import apple.uikit.c.UIKit;
+
+public class iOSImageEncoder implements MediaProcessor, ImageFormatControl {
+
+ String format;
+ Image image;
+ OutputStream out;
+
+ @Override
+ public void complete() throws MediaException {
+
+ NSData data;
+ if ("image/jpeg".equals(format)) {
+ data = UIKit.UIImageJPEGRepresentation(image.getUIImage(), 0.95);
+ }
+ else if ("image/png".equals(format)) {
+ data = UIKit.UIImagePNGRepresentation(image.getUIImage());
+ }
+ else {
+ throw new IllegalStateException("format not supported " + format);
+ }
+
+ try {
+ // TODO there must be a better way to do this
+ byte[] bytes = data.bytes().getBytePtr().toByteArray((int)data.length());
+ out.write(bytes);
+ }
+ catch (Exception ex) {
+ MediaException mex = new MediaException("can not save " + image);
+ mex.initCause(ex);
+ throw mex;
+ }
+ }
+
+ @Override
+ public Control getControl(String controlType) {
+ return this;
+ }
+
+ @Override
+ public Control[] getControls() {
+ return new Control[0];
+ }
+
+ @Override
+ public void setInput(Object image) {
+ this.image = (Image)image;
+ }
+
+ @Override
+ public void setOutput(OutputStream outputStream) {
+ out = outputStream;
+ }
+
+ @Override
+ public void setFormat(String format) {
+ this.format = format;
+ }
+}
Deleted: iOSME/src/net/yura/ios/iOSJpegEncoder.java
===================================================================
--- iOSME/src/net/yura/ios/iOSJpegEncoder.java 2021-07-07 09:51:40 UTC (rev 2515)
+++ iOSME/src/net/yura/ios/iOSJpegEncoder.java 2021-07-07 10:48:48 UTC (rev 2516)
@@ -1,68 +0,0 @@
-package net.yura.ios;
-
-import java.io.OutputStream;
-import javax.microedition.amms.MediaProcessor;
-import javax.microedition.amms.control.ImageFormatControl;
-import javax.microedition.lcdui.Image;
-import javax.microedition.media.Control;
-import javax.microedition.media.MediaException;
-import apple.foundation.NSData;
-import apple.uikit.c.UIKit;
-
-public class iOSJpegEncoder implements MediaProcessor, ImageFormatControl {
-
- String format;
- Image image;
- OutputStream out;
-
- @Override
- public void complete() throws MediaException {
-
- NSData data;
- if ("image/jpeg".equals(format)) {
- data = UIKit.UIImageJPEGRepresentation(image.getUIImage(), 0.95);
- }
- else if ("image/png".equals(format)) {
- data = UIKit.UIImagePNGRepresentation(image.getUIImage());
- }
- else {
- throw new IllegalStateException("format not supported " + format);
- }
-
- try {
- // TODO there must be a better way to do this
- byte[] bytes = data.bytes().getBytePtr().toByteArray((int)data.length());
- out.write(bytes);
- }
- catch (Exception ex) {
- MediaException mex = new MediaException("can not save " + image);
- mex.initCause(ex);
- throw mex;
- }
- }
-
- @Override
- public Control getControl(String controlType) {
- return this;
- }
-
- @Override
- public Control[] getControls() {
- return new Control[0];
- }
-
- @Override
- public void setInput(Object image) {
- this.image = (Image)image;
- }
-
- @Override
- public void setOutput(OutputStream outputStream) {
- out = outputStream;
- }
-
- @Override
- public void setFormat(String format) {
- this.format = format;
- }
-}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-07 09:51:43
|
Revision: 2515
http://sourceforge.net/p/swingme/code/2515
Author: yuranet
Date: 2021-07-07 09:51:40 +0000 (Wed, 07 Jul 2021)
Log Message:
-----------
draw with color matrix works fully
Modified Paths:
--------------
iOSME/src/android/graphics/ColorMatrix.java
iOSME/src/javax/microedition/lcdui/Graphics.java
iOSME/src/javax/microedition/lcdui/Image.java
iOSME/src/javax/microedition/m3g/Graphics3D.java
iOSME/src/net/yura/ios/plaf/IOSBorder.java
Modified: iOSME/src/android/graphics/ColorMatrix.java
===================================================================
--- iOSME/src/android/graphics/ColorMatrix.java 2021-07-06 14:40:40 UTC (rev 2514)
+++ iOSME/src/android/graphics/ColorMatrix.java 2021-07-07 09:51:40 UTC (rev 2515)
@@ -1,8 +1,12 @@
package android.graphics;
+import java.util.Arrays;
import apple.coreimage.CIFilter;
import apple.coreimage.CIVector;
+/**
+ * class "borrowed" from AOSP
+ */
public class ColorMatrix {
private final float[] mArray = new float[20];
@@ -23,13 +27,9 @@
}
public void reset() {
- float[] a = this.mArray;
-
- for(int i = 19; i > 0; --i) {
- a[i] = 0.0F;
- }
-
- a[0] = a[6] = a[12] = a[18] = 1.0F;
+ final float[] a = mArray;
+ Arrays.fill(a, 0);
+ a[0] = a[6] = a[12] = a[18] = 1;
}
public void set(ColorMatrix src) {
@@ -159,29 +159,23 @@
m[12] = 0.0F;
}
- public int filterRGB(int x, int y, int rgb) {
- int R = rgb >> 16 & 255;
- int G = rgb >> 8 & 255;
- int B = rgb >> 0 & 255;
- int A = rgb >> 24 & 255;
- int r = clamp(this.mArray[0] * (float)R + this.mArray[1] * (float)G + this.mArray[2] * (float)B + this.mArray[3] * (float)A + this.mArray[4]);
- int g = clamp(this.mArray[5] * (float)R + this.mArray[6] * (float)G + this.mArray[7] * (float)B + this.mArray[8] * (float)A + this.mArray[9]);
- int b = clamp(this.mArray[10] * (float)R + this.mArray[11] * (float)G + this.mArray[12] * (float)B + this.mArray[13] * (float)A + this.mArray[14]);
- int a = clamp(this.mArray[15] * (float)R + this.mArray[16] * (float)G + this.mArray[17] * (float)B + this.mArray[18] * (float)A + this.mArray[19]);
- return (a & 255) << 24 | (r & 255) << 16 | (g & 255) << 8 | (b & 255) << 0;
- }
+ @Override
+ public boolean equals(Object obj) {
+ // if (obj == this) return true; -- NaN value would mean matrix != itself
+ if (!(obj instanceof ColorMatrix)) {
+ return false;
+ }
- private static int clamp(float value) {
- if(value < 0.0F) {
- value = 0.0F;
- } else if(value > 255.0F) {
- value = 255.0F;
+ // we don't use Arrays.equals(), since that considers NaN == NaN
+ final float[] other = ((ColorMatrix) obj).mArray;
+ for (int i = 0; i < 20; i++) {
+ if (other[i] != mArray[i]) {
+ return false;
+ }
}
-
- return (int)value;
+ return true;
}
-
public CIFilter toCIFilter() {
CIFilter filter = CIFilter.filterWithName("CIColorMatrix");
@@ -199,5 +193,4 @@
return filter;
}
-
}
Modified: iOSME/src/javax/microedition/lcdui/Graphics.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Graphics.java 2021-07-06 14:40:40 UTC (rev 2514)
+++ iOSME/src/javax/microedition/lcdui/Graphics.java 2021-07-07 09:51:40 UTC (rev 2515)
@@ -8,9 +8,13 @@
import apple.coregraphics.struct.CGPoint;
import apple.coregraphics.struct.CGRect;
import apple.coregraphics.struct.CGSize;
+import apple.coreimage.CIContext;
import apple.coreimage.CIFilter;
+import apple.coreimage.CIImage;
+import apple.coreimage.c.CoreImage;
import apple.foundation.NSMutableDictionary;
import apple.foundation.NSString;
+import apple.imageio.enums.CGImagePropertyOrientation;
import apple.uikit.UIBezierPath;
import apple.uikit.UIColor;
import apple.uikit.UIImage;
@@ -379,22 +383,60 @@
// we get the image first, this may close a current bitmap context
UIImage uiImageToDraw = image.getUIImage();
- drawImage(uiImageToDraw, ax, ay, image.getWidth(), image.getHeight());
+ drawInRect(uiImageToDraw, ax, ay, image.getWidth(), image.getHeight());
}
- public void drawImage(UIImage image, int x, int y, int width, int height) {
- CGRect imageRect = getDestRect(x, y, width, height);
- boolean same = isCurrentContext();
-
- if (!same) UIKit.UIGraphicsPushContext(context);
-
+ public void drawInRect(UIImage image, int x, int y, int width, int height) {
if (filter != null) {
- Image.drawInRect(context, image, imageRect, filter);
+ drawInRect(image, x, y, width, height, filter);
}
else {
- image.drawInRect(imageRect);
+ boolean same = isCurrentContext();
+ if (!same) UIKit.UIGraphicsPushContext(context);
+ image.drawInRect(getDestRect(x, y, width, height));
+ if (!same) UIKit.UIGraphicsPopContext();
}
+ }
+ public void drawInRect(UIImage uiImageToDraw, int x, int y, int width, int height, CIFilter filter) {
+ CGRect inRect = getDestRect(x, y, width, height);
+
+ // uiImageToDraw.CIImage() does not seem to work here
+ filter.setValueForKey(CIImage.imageWithCGImage(uiImageToDraw.CGImage()), CoreImage.kCIInputImageKey());
+
+ CIImage output = filter.outputImage();
+ if (output == null) {
+ throw new IllegalStateException("outputImage is null");
+ }
+
+ // drawImageInRectFromRect defaults to drawing upside down, to avoid this we flip the image
+ // not sure whats difference between imageByApplyingOrientation and imageByApplyingCGOrientation
+ output = output.imageByApplyingOrientation(CGImagePropertyOrientation.DownMirrored);
+
+ //CGImageRef cgImage = CIContext.alloc().init().createCGImageFromRect(output, output.extent());
+ //CoreGraphics.CGContextDrawImage(context, inRect, cgImage);
+
+ CIContext c = CIContext.contextWithCGContextOptions(context, null);
+ c.drawImageInRectFromRect(output, inRect, output.extent());
+
+ // TODO remove the image from the filter, this does not work
+ //filter.setNilValueForKey(CoreImage.kCIInputImageKey());
+ }
+
+ public void drawInRect(UIImage uiImageToDraw, int x, int y, int width, int height, CGAffineTransform affineTransform) {
+ CGRect rect = new CGRect(new CGPoint(x, y), new CGSize(width, height));
+ boolean same = isCurrentContext();
+
+ if (!same) UIKit.UIGraphicsPushContext(context);
+
+ CoreGraphics.CGContextTranslateCTM(context, tx, ty);
+ CoreGraphics.CGContextConcatCTM(context, affineTransform);
+
+ uiImageToDraw.drawInRect(rect);
+
+ CoreGraphics.CGContextConcatCTM(context, CoreGraphics.CGAffineTransformInvert(affineTransform));
+ CoreGraphics.CGContextTranslateCTM(context, -tx, -ty);
+
if (!same) UIKit.UIGraphicsPopContext();
}
@@ -497,7 +539,7 @@
UIImage transformed = src.getUIImage(xSrc, ySrc, width, height, transform);
- drawImage(transformed, anchorX, anchorY, destWidth, destHeight);
+ drawInRect(transformed, anchorX, anchorY, destWidth, destHeight);
}
/**
Modified: iOSME/src/javax/microedition/lcdui/Image.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Image.java 2021-07-06 14:40:40 UTC (rev 2514)
+++ iOSME/src/javax/microedition/lcdui/Image.java 2021-07-07 09:51:40 UTC (rev 2515)
@@ -7,24 +7,14 @@
import javax.microedition.lcdui.game.Sprite;
import android.graphics.ColorMatrix;
import org.moe.natj.general.ptr.BytePtr;
-import org.moe.natj.general.ptr.ConstIntPtr;
import org.moe.natj.general.ptr.IntPtr;
-import org.moe.natj.general.ptr.VoidPtr;
import org.moe.natj.general.ptr.impl.PtrFactory;
-import apple.corefoundation.opaque.CFDataRef;
import apple.coregraphics.opaque.CGContextRef;
-import apple.coregraphics.opaque.CGDataProviderRef;
import apple.coregraphics.opaque.CGImageRef;
import apple.coregraphics.struct.CGPoint;
import apple.coregraphics.struct.CGRect;
import apple.coregraphics.struct.CGSize;
-import apple.coreimage.CIContext;
-import apple.coreimage.CIFilter;
-import apple.coreimage.CIImage;
-import apple.coreimage.CIVector;
-import apple.coreimage.c.CoreImage;
import apple.foundation.NSData;
-import apple.foundation.NSDictionary;
import apple.uikit.UIImage;
import apple.uikit.c.UIKit;
import apple.coregraphics.c.CoreGraphics;
@@ -319,29 +309,6 @@
}
public static void filter(Image source, Image bm, ColorMatrix cm) {
- Graphics dist = bm.getGraphics();
- UIImage src = source.getUIImage();
- drawInRect(dist.getContext(), src, new CGRect(CoreGraphics.CGPointZero(), src.size()), cm.toCIFilter());
+ bm.getGraphics().drawInRect(source.getUIImage(), 0, 0, source.getWidth(), source.getHeight(), cm.toCIFilter());
}
-
- public static void drawInRect(CGContextRef context, UIImage uiImageToDraw, CGRect inRect, CIFilter filter) {
- filter.setValueForKey(CIImage.imageWithCGImage(uiImageToDraw.CGImage()), CoreImage.kCIInputImageKey());
-
- CIImage output = filter.outputImage();
- if (output == null) {
- //uiImageToDraw.drawInRect(inRect);
- //if (true) return;
-
- throw new IllegalStateException("outputImage is null");
- }
-
- //CGImageRef cgImage = CIContext.alloc().init().createCGImageFromRect(output, output.extent());
- //CoreGraphics.CGContextDrawImage(context, inRect, cgImage);
-
- CIContext c = CIContext.contextWithCGContextOptions(context, null);
- c.drawImageInRectFromRect(output, inRect, output.extent());
-
- // remove the image from the filter
- //filter.setNilValueForKey(CoreImage.kCIInputImageKey());
- }
}
Modified: iOSME/src/javax/microedition/m3g/Graphics3D.java
===================================================================
--- iOSME/src/javax/microedition/m3g/Graphics3D.java 2021-07-06 14:40:40 UTC (rev 2514)
+++ iOSME/src/javax/microedition/m3g/Graphics3D.java 2021-07-07 09:51:40 UTC (rev 2515)
@@ -3,12 +3,6 @@
import java.util.Hashtable;
import javax.microedition.lcdui.Graphics;
-import apple.coregraphics.opaque.CGContextRef;
-import apple.coregraphics.struct.CGPoint;
-import apple.coregraphics.struct.CGRect;
-import apple.coregraphics.struct.CGSize;
-import apple.uikit.UIImage;
-import apple.uikit.c.UIKit;
public final class Graphics3D {
@@ -52,7 +46,7 @@
targetGraphics.fillRect(vpX, vpY, vpW, vpH);
}
else {
- targetGraphics.drawImage(background.getImage().getImage().getUIImage(), vpX, vpY,vpW, vpH);
+ targetGraphics.drawInRect(background.getImage().getImage().getUIImage(), vpX, vpY, vpW, vpH);
}
}
Modified: iOSME/src/net/yura/ios/plaf/IOSBorder.java
===================================================================
--- iOSME/src/net/yura/ios/plaf/IOSBorder.java 2021-07-06 14:40:40 UTC (rev 2514)
+++ iOSME/src/net/yura/ios/plaf/IOSBorder.java 2021-07-07 09:51:40 UTC (rev 2515)
@@ -5,14 +5,7 @@
import net.yura.mobile.gui.components.Component;
import javax.microedition.lcdui.Graphics;
import javax.microedition.lcdui.game.Sprite;
-import apple.coregraphics.c.CoreGraphics;
-import apple.coregraphics.opaque.CGContextRef;
-import apple.coregraphics.struct.CGAffineTransform;
-import apple.coregraphics.struct.CGPoint;
-import apple.coregraphics.struct.CGRect;
-import apple.coregraphics.struct.CGSize;
import apple.uikit.UIImage;
-import apple.uikit.c.UIKit;
public class IOSBorder extends EmptyBorder {
@@ -28,29 +21,10 @@
int transform = g.getTransform();
if (transform == Sprite.TRANS_NONE) {
- g.getGraphics().drawImage(resizableImage, - left, - top, width + left + right, height + top + bottom);
+ g.getGraphics().drawInRect(resizableImage, - left, - top, width + left + right, height + top + bottom);
}
else {
- int tx = g.getGraphics().getTranslateX();
- int ty = g.getGraphics().getTranslateY();
-
- boolean same = g.getGraphics().isCurrentContext();
- CGContextRef context = g.getGraphics().getContext();
-
- if (!same) UIKit.UIGraphicsPushContext(context);
-
- CGRect rect = new CGRect(new CGPoint( - left, - top), new CGSize(width + left + right, height + top + bottom));
- CGAffineTransform affineTransform = Graphics.getAffineTransform(transform);
-
- CoreGraphics.CGContextTranslateCTM(context, tx, ty);
- CoreGraphics.CGContextConcatCTM(context, affineTransform);
-
- resizableImage.drawInRect(rect);
-
- CoreGraphics.CGContextConcatCTM(context, CoreGraphics.CGAffineTransformInvert(affineTransform));
- CoreGraphics.CGContextTranslateCTM(context, -tx, -ty);
-
- if (!same) UIKit.UIGraphicsPopContext();
+ g.getGraphics().drawInRect(resizableImage, - left, - top, width + left + right, height + top + bottom, Graphics.getAffineTransform(transform));
}
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-06 14:40:42
|
Revision: 2514
http://sourceforge.net/p/swingme/code/2514
Author: yuranet
Date: 2021-07-06 14:40:40 +0000 (Tue, 06 Jul 2021)
Log Message:
-----------
ColorMatrix works
Modified Paths:
--------------
iOSME/src/android/graphics/ColorMatrix.java
Modified: iOSME/src/android/graphics/ColorMatrix.java
===================================================================
--- iOSME/src/android/graphics/ColorMatrix.java 2021-07-06 13:06:17 UTC (rev 2513)
+++ iOSME/src/android/graphics/ColorMatrix.java 2021-07-06 14:40:40 UTC (rev 2514)
@@ -185,13 +185,12 @@
public CIFilter toCIFilter() {
CIFilter filter = CIFilter.filterWithName("CIColorMatrix");
- CIVector rVector = CIVector.vectorWithXYZW(mArray[0],mArray[1],mArray[2],mArray[3]);
- CIVector gVector = CIVector.vectorWithXYZW(mArray[5],mArray[6],mArray[7],mArray[8]);
- CIVector bVector = CIVector.vectorWithXYZW(mArray[10],mArray[11],mArray[12],mArray[13]);
- CIVector aVector = CIVector.vectorWithXYZW(mArray[15],mArray[16],mArray[17],mArray[18]);
- CIVector inputBiasVector = CIVector.vectorWithXYZW(mArray[4],mArray[9],mArray[14],mArray[19]);
+ CIVector rVector = CIVector.vectorWithXYZW(mArray[0], mArray[1], mArray[2], mArray[3]);
+ CIVector gVector = CIVector.vectorWithXYZW(mArray[5], mArray[6], mArray[7], mArray[8]);
+ CIVector bVector = CIVector.vectorWithXYZW(mArray[10], mArray[11], mArray[12], mArray[13]);
+ CIVector aVector = CIVector.vectorWithXYZW(mArray[15], mArray[16], mArray[17], mArray[18]);
+ CIVector inputBiasVector = CIVector.vectorWithXYZW(mArray[4] / 255, mArray[9] / 255, mArray[14] / 255, mArray[19] / 255);
- filter.setDefaults();
filter.setValueForKey(rVector, "inputRVector");
filter.setValueForKey(gVector, "inputGVector");
filter.setValueForKey(bVector, "inputBVector");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-06 13:06:19
|
Revision: 2513
http://sourceforge.net/p/swingme/code/2513
Author: yuranet
Date: 2021-07-06 13:06:17 +0000 (Tue, 06 Jul 2021)
Log Message:
-----------
color matrix works for simple images
Modified Paths:
--------------
iOSME/src/android/graphics/ColorMatrix.java
iOSME/src/javax/microedition/lcdui/Graphics.java
iOSME/src/javax/microedition/lcdui/Image.java
iOSME/src/javax/microedition/m3g/Graphics3D.java
iOSME/src/net/yura/ios/plaf/IOSBorder.java
Modified: iOSME/src/android/graphics/ColorMatrix.java
===================================================================
--- iOSME/src/android/graphics/ColorMatrix.java 2021-07-06 09:04:37 UTC (rev 2512)
+++ iOSME/src/android/graphics/ColorMatrix.java 2021-07-06 13:06:17 UTC (rev 2513)
@@ -1,5 +1,8 @@
package android.graphics;
+import apple.coreimage.CIFilter;
+import apple.coreimage.CIVector;
+
public class ColorMatrix {
private final float[] mArray = new float[20];
@@ -177,4 +180,25 @@
return (int)value;
}
+
+
+ public CIFilter toCIFilter() {
+
+ CIFilter filter = CIFilter.filterWithName("CIColorMatrix");
+ CIVector rVector = CIVector.vectorWithXYZW(mArray[0],mArray[1],mArray[2],mArray[3]);
+ CIVector gVector = CIVector.vectorWithXYZW(mArray[5],mArray[6],mArray[7],mArray[8]);
+ CIVector bVector = CIVector.vectorWithXYZW(mArray[10],mArray[11],mArray[12],mArray[13]);
+ CIVector aVector = CIVector.vectorWithXYZW(mArray[15],mArray[16],mArray[17],mArray[18]);
+ CIVector inputBiasVector = CIVector.vectorWithXYZW(mArray[4],mArray[9],mArray[14],mArray[19]);
+
+ filter.setDefaults();
+ filter.setValueForKey(rVector, "inputRVector");
+ filter.setValueForKey(gVector, "inputGVector");
+ filter.setValueForKey(bVector, "inputBVector");
+ filter.setValueForKey(aVector, "inputAVector");
+ filter.setValueForKey(inputBiasVector, "inputBiasVector");
+
+ return filter;
+ }
+
}
Modified: iOSME/src/javax/microedition/lcdui/Graphics.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Graphics.java 2021-07-06 09:04:37 UTC (rev 2512)
+++ iOSME/src/javax/microedition/lcdui/Graphics.java 2021-07-06 13:06:17 UTC (rev 2513)
@@ -8,6 +8,7 @@
import apple.coregraphics.struct.CGPoint;
import apple.coregraphics.struct.CGRect;
import apple.coregraphics.struct.CGSize;
+import apple.coreimage.CIFilter;
import apple.foundation.NSMutableDictionary;
import apple.foundation.NSString;
import apple.uikit.UIBezierPath;
@@ -343,9 +344,9 @@
drawString(new String(carr), x, y, anchor); // as we send to a public method we do not need to add tx and ty
}
+ private CIFilter filter;
public void setColorMatrix(ColorMatrix cm) {
- //throw new UnsupportedOperationException();
- //paint.setColorFilter( cm==null?null:new ColorMatrixColorFilter(cm) );
+ filter = cm == null ? null : cm.toCIFilter();
}
public void drawImage(Image image, int x, int y, int anchor) {
@@ -376,15 +377,24 @@
ay = y - image.getHeight();
}
- CGRect imageRect = getDestRect(ax, ay, image.getWidth(), image.getHeight());
-
// we get the image first, this may close a current bitmap context
UIImage uiImageToDraw = image.getUIImage();
+ drawImage(uiImageToDraw, ax, ay, image.getWidth(), image.getHeight());
+ }
+ public void drawImage(UIImage image, int x, int y, int width, int height) {
+ CGRect imageRect = getDestRect(x, y, width, height);
boolean same = isCurrentContext();
if (!same) UIKit.UIGraphicsPushContext(context);
- uiImageToDraw.drawInRect(imageRect);
+
+ if (filter != null) {
+ Image.drawInRect(context, image, imageRect, filter);
+ }
+ else {
+ image.drawInRect(imageRect);
+ }
+
if (!same) UIKit.UIGraphicsPopContext();
}
@@ -482,16 +492,12 @@
}
*/
- // TODO if we dont need to crop, we can juse use
+ // TODO if we dont need to crop, we can just use
// CGAffineTransform affineTransform = getAffineTransform(transform);
UIImage transformed = src.getUIImage(xSrc, ySrc, width, height, transform);
- boolean same = isCurrentContext();
-
- if (!same) UIKit.UIGraphicsPushContext(context);
- transformed.drawInRect(getDestRect(anchorX, anchorY, destWidth, destHeight));
- if (!same) UIKit.UIGraphicsPopContext();
+ drawImage(transformed, anchorX, anchorY, destWidth, destHeight);
}
/**
Modified: iOSME/src/javax/microedition/lcdui/Image.java
===================================================================
--- iOSME/src/javax/microedition/lcdui/Image.java 2021-07-06 09:04:37 UTC (rev 2512)
+++ iOSME/src/javax/microedition/lcdui/Image.java 2021-07-06 13:06:17 UTC (rev 2513)
@@ -18,7 +18,13 @@
import apple.coregraphics.struct.CGPoint;
import apple.coregraphics.struct.CGRect;
import apple.coregraphics.struct.CGSize;
+import apple.coreimage.CIContext;
+import apple.coreimage.CIFilter;
+import apple.coreimage.CIImage;
+import apple.coreimage.CIVector;
+import apple.coreimage.c.CoreImage;
import apple.foundation.NSData;
+import apple.foundation.NSDictionary;
import apple.uikit.UIImage;
import apple.uikit.c.UIKit;
import apple.coregraphics.c.CoreGraphics;
@@ -313,12 +319,29 @@
}
public static void filter(Image source, Image bm, ColorMatrix cm) {
-/*
- android.graphics.Paint paint = new android.graphics.Paint();
- paint.setColorFilter(new android.graphics.ColorMatrixColorFilter(cm));
- new Canvas(bm.uiImage).drawBitmap(source.uiImage, 0, 0, paint);
-*/
- // TODO
- throw new UnsupportedOperationException();
+ Graphics dist = bm.getGraphics();
+ UIImage src = source.getUIImage();
+ drawInRect(dist.getContext(), src, new CGRect(CoreGraphics.CGPointZero(), src.size()), cm.toCIFilter());
}
+
+ public static void drawInRect(CGContextRef context, UIImage uiImageToDraw, CGRect inRect, CIFilter filter) {
+ filter.setValueForKey(CIImage.imageWithCGImage(uiImageToDraw.CGImage()), CoreImage.kCIInputImageKey());
+
+ CIImage output = filter.outputImage();
+ if (output == null) {
+ //uiImageToDraw.drawInRect(inRect);
+ //if (true) return;
+
+ throw new IllegalStateException("outputImage is null");
+ }
+
+ //CGImageRef cgImage = CIContext.alloc().init().createCGImageFromRect(output, output.extent());
+ //CoreGraphics.CGContextDrawImage(context, inRect, cgImage);
+
+ CIContext c = CIContext.contextWithCGContextOptions(context, null);
+ c.drawImageInRectFromRect(output, inRect, output.extent());
+
+ // remove the image from the filter
+ //filter.setNilValueForKey(CoreImage.kCIInputImageKey());
+ }
}
Modified: iOSME/src/javax/microedition/m3g/Graphics3D.java
===================================================================
--- iOSME/src/javax/microedition/m3g/Graphics3D.java 2021-07-06 09:04:37 UTC (rev 2512)
+++ iOSME/src/javax/microedition/m3g/Graphics3D.java 2021-07-06 13:06:17 UTC (rev 2513)
@@ -52,19 +52,7 @@
targetGraphics.fillRect(vpX, vpY, vpW, vpH);
}
else {
- UIImage image = background.getImage().getImage().getUIImage();
- CGContextRef context = targetGraphics.getContext();
- int tx = targetGraphics.getTranslateX();
- int ty = targetGraphics.getTranslateY();
-
- CGRect imageRect = new CGRect(new CGPoint(tx+vpX, ty+vpY), new CGSize(vpW, vpH));
-
- CGContextRef current = UIKit.UIGraphicsGetCurrentContext();
- boolean same = current.getPeer().equals(context.getPeer());
-
- if (!same) UIKit.UIGraphicsPushContext(context);
- image.drawInRect(imageRect);
- if (!same) UIKit.UIGraphicsPopContext();
+ targetGraphics.drawImage(background.getImage().getImage().getUIImage(), vpX, vpY,vpW, vpH);
}
}
Modified: iOSME/src/net/yura/ios/plaf/IOSBorder.java
===================================================================
--- iOSME/src/net/yura/ios/plaf/IOSBorder.java 2021-07-06 09:04:37 UTC (rev 2512)
+++ iOSME/src/net/yura/ios/plaf/IOSBorder.java 2021-07-06 13:06:17 UTC (rev 2513)
@@ -25,20 +25,20 @@
@Override
public void paintBorder(Component c, Graphics2D g, int width, int height) {
- int tx = g.getGraphics().getTranslateX();
- int ty = g.getGraphics().getTranslateY();
-
int transform = g.getTransform();
- boolean same = g.getGraphics().isCurrentContext();
- CGContextRef context = g.getGraphics().getContext();
- if (!same) UIKit.UIGraphicsPushContext(context);
-
if (transform == Sprite.TRANS_NONE) {
- CGRect rect = new CGRect(new CGPoint(tx - left, ty - top), new CGSize(width + left + right, height + top + bottom));
- resizableImage.drawInRect(rect);
+ g.getGraphics().drawImage(resizableImage, - left, - top, width + left + right, height + top + bottom);
}
else {
+ int tx = g.getGraphics().getTranslateX();
+ int ty = g.getGraphics().getTranslateY();
+
+ boolean same = g.getGraphics().isCurrentContext();
+ CGContextRef context = g.getGraphics().getContext();
+
+ if (!same) UIKit.UIGraphicsPushContext(context);
+
CGRect rect = new CGRect(new CGPoint( - left, - top), new CGSize(width + left + right, height + top + bottom));
CGAffineTransform affineTransform = Graphics.getAffineTransform(transform);
@@ -49,8 +49,8 @@
CoreGraphics.CGContextConcatCTM(context, CoreGraphics.CGAffineTransformInvert(affineTransform));
CoreGraphics.CGContextTranslateCTM(context, -tx, -ty);
+
+ if (!same) UIKit.UIGraphicsPopContext();
}
-
- if (!same) UIKit.UIGraphicsPopContext();
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-06 09:04:39
|
Revision: 2512
http://sourceforge.net/p/swingme/code/2512
Author: yuranet
Date: 2021-07-06 09:04:37 +0000 (Tue, 06 Jul 2021)
Log Message:
-----------
status bar color correct on simulator and old iphones, sadly not new iphone
Modified Paths:
--------------
iOSME/src/net/yura/ios/AppController.java
iOSME/src/net/yura/ios/SwingMEiOSApplication.java
Modified: iOSME/src/net/yura/ios/AppController.java
===================================================================
--- iOSME/src/net/yura/ios/AppController.java 2021-07-06 07:48:43 UTC (rev 2511)
+++ iOSME/src/net/yura/ios/AppController.java 2021-07-06 09:04:37 UTC (rev 2512)
@@ -11,6 +11,7 @@
import apple.uikit.UIColor;
import apple.uikit.UIView;
import apple.uikit.UIViewController;
+import apple.uikit.enums.UIStatusBarStyle;
public class AppController extends UIViewController {
@@ -33,6 +34,11 @@
display.setController(this);
}
+ @Override
+ public long preferredStatusBarStyle() {
+ return UIStatusBarStyle.BlackOpaque;
+ }
+
public void setRendererView(UIView renderer) {
this.renderer = renderer;
view().addSubview(renderer);
Modified: iOSME/src/net/yura/ios/SwingMEiOSApplication.java
===================================================================
--- iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2021-07-06 07:48:43 UTC (rev 2511)
+++ iOSME/src/net/yura/ios/SwingMEiOSApplication.java 2021-07-06 09:04:37 UTC (rev 2512)
@@ -68,30 +68,26 @@
@Override
public boolean applicationDidFinishLaunchingWithOptions(UIApplication application, NSDictionary launchOptions) {
UIViewController vc = AppController.alloc().init();
+
+ // TODO do we need this? will this be used to open an internal browser?
UINavigationController navigationController = UINavigationController.alloc().init();
navigationController.setNavigationBarHidden(true);
navigationController.initWithRootViewController(vc);
UIScreen screen = UIScreen.mainScreen();
-
- //CGRect statusBar = application.statusBarFrame();
- CGRect bounds = screen.bounds();
- window = UIWindow.alloc().initWithFrame(bounds);
-
+ window = UIWindow.alloc().initWithFrame(screen.bounds());
window.setRootViewController(navigationController);
- window.makeKeyAndVisible();
-
+ // setup and launch swingme app
setupSystemProperties();
-
NSBundle mainBundle = NSBundle.mainBundle();
String mainClass = (String)mainBundle.objectForInfoDictionaryKey("SwingME.Main.Class");
-
if (mainClass == null) {
throw new IllegalStateException("'SwingME.Main.Class' not set in app 'info.plist'");
}
+ startSwingMEApp(mainClass); // swingme canvas (DesktopPane) is created and set when the main class is instantiated
- startSwingMEApp(mainClass);
+ window.makeKeyAndVisible(); // this will call AppController.viewDidLoad
return true;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yu...@us...> - 2021-07-06 07:48:46
|
Revision: 2511
http://sourceforge.net/p/swingme/code/2511
Author: yuranet
Date: 2021-07-06 07:48:43 +0000 (Tue, 06 Jul 2021)
Log Message:
-----------
fix to default to no focus on ios
Modified Paths:
--------------
SwingME/src/net/yura/mobile/gui/DesktopPane.java
SwingME/src/net/yura/mobile/gui/components/Window.java
Modified: SwingME/src/net/yura/mobile/gui/DesktopPane.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/DesktopPane.java 2021-07-06 00:13:25 UTC (rev 2510)
+++ SwingME/src/net/yura/mobile/gui/DesktopPane.java 2021-07-06 07:48:43 UTC (rev 2511)
@@ -143,6 +143,7 @@
public boolean HIDDEN_MENU; // on old android and blackberry the menu and back are hardware buttons
public boolean HIDDEN_BACK;
public boolean GRID_MENU; // on old android
+ public boolean DEFAULT_NO_FOCUS;
// object variables
protected Midlet midlet;
@@ -199,6 +200,7 @@
VERY_BIG_SCREEN = platform == Midlet.PLATFORM_ME4SE;
MAX_CLOSE_BUTTONS = platform == Midlet.PLATFORM_ME4SE;
IPHONE_SCROLL = platform != Midlet.PLATFORM_ME4SE;
+ DEFAULT_NO_FOCUS = platform == Midlet.PLATFORM_ANDROID || platform == Midlet.PLATFORM_IOS;
QWERTY_KAYPAD = platform == Midlet.PLATFORM_ME4SE || platform == Midlet.PLATFORM_ANDROID || platform == Midlet.PLATFORM_IOS || (platform == Midlet.PLATFORM_BLACKBERRY && !KeyEvent.BLACKBERRY_ITUT);
Modified: SwingME/src/net/yura/mobile/gui/components/Window.java
===================================================================
--- SwingME/src/net/yura/mobile/gui/components/Window.java 2021-07-06 00:13:25 UTC (rev 2510)
+++ SwingME/src/net/yura/mobile/gui/components/Window.java 2021-07-06 07:48:43 UTC (rev 2511)
@@ -92,7 +92,7 @@
// on android this call can return null even if there are components to focus
// as on android no components are focused by defualt
- if (Midlet.getPlatform()!=Midlet.PLATFORM_ANDROID) {
+ if (!DesktopPane.getDesktopPane().DEFAULT_NO_FOCUS) {
breakOutAction(null,Canvas.DOWN,false,false);
}
}
@@ -105,7 +105,7 @@
* @see java.awt.KeyboardFocusManager#clearGlobalFocusOwner() KeyboardFocusManager.clearGlobalFocusOwner
*/
public void setNothingFocused() {
- if (Midlet.getPlatform()==Midlet.PLATFORM_ANDROID) {
+ if (DesktopPane.getDesktopPane().DEFAULT_NO_FOCUS) {
// we have to use mostRecentFocusOwner here as the window may have lost focus by now
// as the button could have opened a new window, and focusOwner could be returning null
Component f = getMostRecentFocusOwner();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
