My favorites
▼
|
Sign in
microemu
MicroEmu is a pure Java implementation of Java ME.
Project Home
Downloads
Wiki
Issues
Source
Export to GitHub
READ-ONLY: This project has been
archived
. For more information see
this post
.
Search
Search within:
All issues
Open issues
New issues
Issues to verify
for
Advanced search
Search tips
Subscriptions
Issue
20
attachment: fix_resize.diff
(5.4 KB)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
Index: microemu-javase-swing/src/main/java/org/microemu/app/Main.java
===================================================================
--- microemu-javase-swing/src/main/java/org/microemu/app/Main.java (revision 2244)
+++ microemu-javase-swing/src/main/java/org/microemu/app/Main.java (working copy)
@@ -52,11 +52,12 @@
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.Timer;
-import java.util.TimerTask;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Timer;
+import java.util.TimerTask;
import javax.microedition.midlet.MIDletStateChangeException;
import javax.swing.ImageIcon;
@@ -106,9 +107,10 @@
import org.microemu.device.EmulatorContext;
import org.microemu.device.FontManager;
import org.microemu.device.InputMethod;
-import org.microemu.device.impl.DeviceDisplayImpl;
-import org.microemu.device.impl.DeviceImpl;
-import org.microemu.device.impl.Rectangle;
+import org.microemu.device.impl.DeviceDisplayImpl;
+import org.microemu.device.impl.DeviceImpl;
+import org.microemu.device.impl.Rectangle;
+import org.microemu.device.impl.SoftButton;
import org.microemu.device.j2se.J2SEDevice;
import org.microemu.device.j2se.J2SEDeviceDisplay;
import org.microemu.device.j2se.J2SEFontManager;
@@ -726,17 +728,7 @@
count++;
DeviceDisplayImpl deviceDisplay = (DeviceDisplayImpl) DeviceFactory.getDevice().getDeviceDisplay();
if (deviceDisplay.isResizable()) {
- deviceDisplay.setDisplayRectangle(new Rectangle(0, 0, devicePanel.getWidth(), devicePanel.getHeight()));
- ((SwingDisplayComponent) devicePanel.getDisplayComponent()).init();
- MIDletAccess ma = MIDletBridge.getMIDletAccess();
- if (ma == null) {
- return;
- }
- DisplayAccess da = ma.getDisplayAccess();
- if (da != null) {
- da.sizeChanged();
- deviceDisplay.repaint(0, 0, deviceDisplay.getFullWidth(), deviceDisplay.getFullHeight());
- }
+ setDeviceSize(deviceDisplay, devicePanel.getWidth(), devicePanel.getHeight());
devicePanel.revalidate();
statusBarListener.statusBarChanged("New size: " + deviceDisplay.getFullWidth() + "x"
+ deviceDisplay.getFullHeight());
@@ -925,18 +917,7 @@
resizeDeviceDisplayDialog.setDeviceDisplaySize(deviceDisplay.getFullWidth(), deviceDisplay
.getFullHeight());
if (SwingDialogWindow.show(Main.this, "Enter new size...", resizeDeviceDisplayDialog, true)) {
- deviceDisplay.setDisplayRectangle(new Rectangle(0, 0, resizeDeviceDisplayDialog
- .getDeviceDisplayWidth(), resizeDeviceDisplayDialog.getDeviceDisplayHeight()));
- ((SwingDisplayComponent) devicePanel.getDisplayComponent()).init();
- MIDletAccess ma = MIDletBridge.getMIDletAccess();
- if (ma == null) {
- return;
- }
- DisplayAccess da = ma.getDisplayAccess();
- if (da != null) {
- da.sizeChanged();
- deviceDisplay.repaint(0, 0, deviceDisplay.getFullWidth(), deviceDisplay.getFullHeight());
- }
+ setDeviceSize(deviceDisplay, resizeDeviceDisplayDialog.getDeviceDisplayWidth(), resizeDeviceDisplayDialog.getDeviceDisplayHeight());
pack();
devicePanel.requestFocus();
}
@@ -988,7 +969,7 @@
if (deviceDisplay.isResizable()) {
Rectangle size = Config.getDeviceEntryDisplaySize(entry);
if (size != null) {
- deviceDisplay.setDisplayRectangle(size);
+ setDeviceSize(deviceDisplay, size.width, size.height);
}
}
common.setDevice(device);
@@ -1003,6 +984,32 @@
}
return false;
}
+
+ protected void setDeviceSize(DeviceDisplayImpl deviceDisplay, int width, int height) {
+ // move the soft buttons
+ int menuh = 0;
+ Enumeration en = DeviceFactory.getDevice().getSoftButtons().elements();
+ while (en.hasMoreElements()) {
+ SoftButton button = (SoftButton) en.nextElement();
+ Rectangle paintable = button.getPaintable();
+ paintable.y = height - paintable.height;
+ menuh = paintable.height;
+ }
+ // resize the display area
+ deviceDisplay.setDisplayPaintable(new Rectangle(0, 0, width, height - menuh));
+ deviceDisplay.setDisplayRectangle(new Rectangle(0, 0, width, height));
+ ((SwingDisplayComponent) devicePanel.getDisplayComponent()).init();
+ // update display
+ MIDletAccess ma = MIDletBridge.getMIDletAccess();
+ if (ma == null) {
+ return;
+ }
+ DisplayAccess da = ma.getDisplayAccess();
+ if (da != null) {
+ da.sizeChanged();
+ deviceDisplay.repaint(0, 0, deviceDisplay.getFullWidth(), deviceDisplay.getFullHeight());
+ }
+ }
protected void updateDevice() {
devicePanel.init();
@@ -1051,7 +1058,7 @@
if (deviceDisplay.isResizable()) {
Rectangle size = Config.getDeviceEntryDisplaySize(app.deviceEntry);
if (size != null) {
- deviceDisplay.setDisplayRectangle(size);
+ app.setDeviceSize(deviceDisplay, size.width, size.height);
}
}
}
Powered by
Google Project Hosting