angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-11 22:47:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

fixed crash when running in Webswing (issue #290)

Browse Source
This commit is contained in:
Karl Tauber
2021-03-30 01:06:30 +02:00
parent 477c3b6b1e
commit 7a2d0e7fcb
5 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
CHANGELOG.md
View File

@@ -1,6 +1,13 @@
FlatLaf Change Log FlatLaf Change Log
================== ==================
## 1.2-SNAPSHOT
#### Fixed bugs
- Fixed crash when running in Webswing. (issue #290)
## 1.1.1 ## 1.1.1
#### New features and improvements #### New features and improvements

2
flatlaf-core/src/main/java/com/formdev/flatlaf/FlatLaf.java
View File

@@ -157,7 +157,7 @@ public abstract class FlatLaf
*/ */
@Override @Override
public boolean getSupportsWindowDecorations() { public boolean getSupportsWindowDecorations() {
if( SystemInfo.isProjector || SystemInfo.isWinPE ) if( SystemInfo.isProjector || SystemInfo.isWebswing || SystemInfo.isWinPE )
return false; return false;
if( SystemInfo.isWindows_10_orLater && if( SystemInfo.isWindows_10_orLater &&

4
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatNativeWindowBorder.java
View File

@@ -242,8 +242,8 @@ public class FlatNativeWindowBorder
if( !SystemInfo.isWindows_10_orLater ) if( !SystemInfo.isWindows_10_orLater )
return; return;
// do not use when running in JetBrains Projector or WinPE // do not use when running in JetBrains Projector, Webswing or WinPE
if( SystemInfo.isProjector || SystemInfo.isWinPE ) if( SystemInfo.isProjector || SystemInfo.isWebswing || SystemInfo.isWinPE )
return; return;
// check whether disabled via system property // check whether disabled via system property

2
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatPopupFactory.java
View File

@@ -70,7 +70,7 @@ public class FlatPopupFactory
boolean forceHeavyWeight = isOptionEnabled( owner, contents, FlatClientProperties.POPUP_FORCE_HEAVY_WEIGHT, "Popup.forceHeavyWeight" ); boolean forceHeavyWeight = isOptionEnabled( owner, contents, FlatClientProperties.POPUP_FORCE_HEAVY_WEIGHT, "Popup.forceHeavyWeight" );
if( !isOptionEnabled( owner, contents, FlatClientProperties.POPUP_DROP_SHADOW_PAINTED, "Popup.dropShadowPainted" ) || SystemInfo.isProjector ) if( !isOptionEnabled( owner, contents, FlatClientProperties.POPUP_DROP_SHADOW_PAINTED, "Popup.dropShadowPainted" ) || SystemInfo.isProjector || SystemInfo.isWebswing )
return new NonFlashingPopup( getPopupForScreenOfOwner( owner, contents, x, y, forceHeavyWeight ), contents ); return new NonFlashingPopup( getPopupForScreenOfOwner( owner, contents, x, y, forceHeavyWeight ), contents );
// macOS and Linux adds drop shadow to heavy weight popups // macOS and Linux adds drop shadow to heavy weight popups

2
flatlaf-core/src/main/java/com/formdev/flatlaf/util/SystemInfo.java
View File

@@ -56,6 +56,7 @@ public class SystemInfo
// other // other
/** @since 1.1 */ public static final boolean isProjector; /** @since 1.1 */ public static final boolean isProjector;
/** @since 1.1.2 */ public static final boolean isWebswing;
/** @since 1.1.1 */ public static final boolean isWinPE; /** @since 1.1.1 */ public static final boolean isWinPE;
static { static {
@@ -92,6 +93,7 @@ public class SystemInfo
// other // other
isProjector = Boolean.getBoolean( "org.jetbrains.projector.server.enable" ); isProjector = Boolean.getBoolean( "org.jetbrains.projector.server.enable" );
isWebswing = (System.getProperty( "webswing.rootDir" ) != null);
isWinPE = isWindows && "X:\\Windows\\System32".equalsIgnoreCase( System.getProperty( "user.dir" ) ); isWinPE = isWindows && "X:\\Windows\\System32".equalsIgnoreCase( System.getProperty( "user.dir" ) );
} }