Merge pull request #19 from uniCenta/UOCL-251-mac-in-full-screen-freezes-on-arm-architecture
UOCL-251 work around added
This commit is contained in:
@@ -65,6 +65,10 @@ public class JRootKiosk extends javax.swing.JFrame implements AppMessage {
|
|||||||
*/
|
*/
|
||||||
public void initFrame(AppProperties props) throws IOException {
|
public void initFrame(AppProperties props) throws IOException {
|
||||||
|
|
||||||
|
String osName = System.getProperty("os.name").toLowerCase();
|
||||||
|
boolean isWindows = osName.startsWith("windows");
|
||||||
|
boolean isMac = osName.startsWith("mac");
|
||||||
|
|
||||||
m_OS = new OSValidator();
|
m_OS = new OSValidator();
|
||||||
m_props = props;
|
m_props = props;
|
||||||
|
|
||||||
@@ -84,7 +88,12 @@ public class JRootKiosk extends javax.swing.JFrame implements AppMessage {
|
|||||||
setTitle(AppLocal.APP_NAME + " - " + AppLocal.APP_VERSION);
|
setTitle(AppLocal.APP_NAME + " - " + AppLocal.APP_VERSION);
|
||||||
|
|
||||||
Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
|
Dimension d = Toolkit.getDefaultToolkit().getScreenSize();
|
||||||
setBounds(0, 0, d.width, d.height);
|
if (isMac) {
|
||||||
|
setBounds(0, 25, d.width, d.height - 25);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
setBounds(0, 0, d.width, d.height);
|
||||||
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* 4 Sep 17 JG
|
* 4 Sep 17 JG
|
||||||
@@ -92,13 +101,10 @@ public class JRootKiosk extends javax.swing.JFrame implements AppMessage {
|
|||||||
* Change here for Linux/Ubuntu full screen
|
* Change here for Linux/Ubuntu full screen
|
||||||
* Thanks to Hans Lengerke for solution
|
* Thanks to Hans Lengerke for solution
|
||||||
*/
|
*/
|
||||||
String osName = System.getProperty("os.name").toLowerCase();
|
|
||||||
boolean isWindows = osName.startsWith("windows");
|
|
||||||
|
|
||||||
GraphicsDevice device = GraphicsEnvironment
|
GraphicsDevice device = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice();
|
||||||
.getLocalGraphicsEnvironment().getDefaultScreenDevice();
|
|
||||||
|
|
||||||
if (device.isFullScreenSupported() && !isWindows) {
|
if (device.isFullScreenSupported() && !isWindows && !isMac) {
|
||||||
setResizable(true);
|
setResizable(true);
|
||||||
|
|
||||||
addFocusListener(new FocusListener() {
|
addFocusListener(new FocusListener() {
|
||||||
|
|||||||
Reference in New Issue
Block a user