From feb12b67d09370be1a570176a1b53a680ff31b93 Mon Sep 17 00:00:00 2001 From: Phillipus Date: Wed, 14 Feb 2024 14:57:03 +0000 Subject: [PATCH] Integration Build for Eclipse 4.31 - Remove slf4j from target as this doesn't supress the log message in this version - SplashHandler workaround not needed - Themes update --- com.archimatetool.editor.product/archi.target | 14 +++-- .../eclipse/css/dark/e4-dark_partstyle.css | 12 +++- .../css/dark/e4-dark_preferencestyle.css | 4 +- .../eclipse/css/light/e4-light_tabstyle.css | 9 +++ .../archimatetool/editor/SplashHandler.java | 61 +------------------ pom.xml | 7 ++- 6 files changed, 38 insertions(+), 69 deletions(-) diff --git a/com.archimatetool.editor.product/archi.target b/com.archimatetool.editor.product/archi.target index 2f2859b52..7db5052e4 100644 --- a/com.archimatetool.editor.product/archi.target +++ b/com.archimatetool.editor.product/archi.target @@ -3,15 +3,17 @@ - - - - - + + + + + + + + - diff --git a/com.archimatetool.editor.themes/themes/eclipse/css/dark/e4-dark_partstyle.css b/com.archimatetool.editor.themes/themes/eclipse/css/dark/e4-dark_partstyle.css index 1344b2717..0a90e86e3 100644 --- a/com.archimatetool.editor.themes/themes/eclipse/css/dark/e4-dark_partstyle.css +++ b/com.archimatetool.editor.themes/themes/eclipse/css/dark/e4-dark_partstyle.css @@ -108,8 +108,18 @@ } .MPart FormHeading > CLabel { background-color: #505f70; - color: #E98787; } + +.MPartFormHeaderCLabelError { + color:'#org-eclipse-ui-workbench-FORM_HEADING_ERROR_COLOR'; +} +.MPartFormHeaderCLabelWarning { + color:'#org-eclipse-ui-workbench-FORM_HEADING_WARNING_COLOR'; +} +.MPartFormHeaderCLabelInfo { + color:'#org-eclipse-ui-workbench-FORM_HEADING_INFO_COLOR'; +} + /* ------------------------------------------------------------- */ #org-eclipse-jdt-ui-SourceView StyledText, diff --git a/com.archimatetool.editor.themes/themes/eclipse/css/dark/e4-dark_preferencestyle.css b/com.archimatetool.editor.themes/themes/eclipse/css/dark/e4-dark_preferencestyle.css index b90da2d24..b9adbc6bb 100644 --- a/com.archimatetool.editor.themes/themes/eclipse/css/dark/e4-dark_preferencestyle.css +++ b/com.archimatetool.editor.themes/themes/eclipse/css/dark/e4-dark_preferencestyle.css @@ -62,6 +62,9 @@ IEclipsePreferences#org-eclipse-ui-workbench:org-eclipse-ui-themes { /* pseudo a 'org.eclipse.ui.workbench.INFORMATION_FOREGROUND=238,238,238' 'org.eclipse.ui.workbench.HOVER_BACKGROUND=52,57,61' 'org.eclipse.ui.workbench.HOVER_FOREGROUND=238,238,238' + 'org.eclipse.ui.workbench.FORM_HEADING_ERROR_COLOR=255,110,110' + 'org.eclipse.ui.workbench.FORM_HEADING_WARNING_COLOR=255,200,0' + 'org.eclipse.ui.workbench.FORM_HEADING_INFO_COLOR=170,170,170' 'ERROR_COLOR=247,68,117' 'HYPERLINK_COLOR=111,197,238' 'INCOMING_COLOR=31,179,235' @@ -73,4 +76,3 @@ IEclipsePreferences#org-eclipse-ui-workbench:org-eclipse-ui-themes { /* pseudo a 'org.eclipse.jface.REVISION_NEWEST_COLOR=75,44,3' 'org.eclipse.jface.REVISION_OLDEST_COLOR=154,113,61' } - diff --git a/com.archimatetool.editor.themes/themes/eclipse/css/light/e4-light_tabstyle.css b/com.archimatetool.editor.themes/themes/eclipse/css/light/e4-light_tabstyle.css index b37dbf777..6306b6dde 100644 --- a/com.archimatetool.editor.themes/themes/eclipse/css/light/e4-light_tabstyle.css +++ b/com.archimatetool.editor.themes/themes/eclipse/css/light/e4-light_tabstyle.css @@ -30,6 +30,7 @@ padding: 0px; color: '#org-eclipse-ui-workbench-INACTIVE_TAB_TEXT_COLOR'; swt-draw-custom-tab-content-background: true; + swt-unselected-hot-tab-color-background:'#org-eclipse-ui-workbench-ACTIVE_TAB_BG_START'; } .MPartStack.active { @@ -54,6 +55,14 @@ CTabFolder.MArea { padding: 0px; } +CTabFolder { + swt-selected-tab-highlight: none; +} + +CTabFolder.active { + swt-selected-tab-highlight: rgb(103,145,230); + swt-selected-highlight-top: false; +} .MPartStack.active.noFocus > CTabItem:selected { color: '#org-eclipse-ui-workbench-ACTIVE_NOFOCUS_TAB_TEXT_COLOR'; diff --git a/com.archimatetool.editor/src/com/archimatetool/editor/SplashHandler.java b/com.archimatetool.editor/src/com/archimatetool/editor/SplashHandler.java index 87074e85c..220424492 100644 --- a/com.archimatetool.editor/src/com/archimatetool/editor/SplashHandler.java +++ b/com.archimatetool.editor/src/com/archimatetool/editor/SplashHandler.java @@ -7,18 +7,12 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; -import org.eclipse.swt.graphics.GC; -import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; -import org.eclipse.swt.graphics.Transform; import org.eclipse.swt.widgets.Composite; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.splash.AbstractSplashHandler; -import com.archimatetool.editor.utils.PlatformUtils; - /** * Splash Handler */ @@ -31,9 +25,6 @@ public SplashHandler() { public void init(Shell shell) { super.init(shell); - // Check for Mac bug - checkMacBackgroundImageInverted(shell); - shell.setBackgroundMode(SWT.INHERIT_FORCE); String version = Messages.SplashHandler_0 + " " + ArchiPlugin.INSTANCE.getVersion(); //$NON-NLS-1$ @@ -47,55 +38,5 @@ public void init(Shell shell) { e.gc.setForeground(new Color(35, 35, 140)); e.gc.drawString(version, 19, 166, true); }); - } - - /** - * macOS Sonoma 14 flips background images on Control#setBackgroundImage - * See https://github.com/eclipse-platform/eclipse.platform.swt/issues/772 - */ - private void checkMacBackgroundImageInverted(Shell shell) { - // This was partially fixed for Eclipse 4.30 in org.eclipse.ui.internal.Workbench but that only checks for macOS 14 - // So that fix won't work on macOS 15 and greater. - // https://github.com/eclipse-platform/eclipse.platform.ui/pull/1355/commits/884bb26a23374c5c1def95ca70b7abc74f395382 - // However, there is a better macOS version check in Eclipse 4.31. - // So we'll compare with macOS 15. - // TODO: remove this if and when we target Eclipse 4.31 or greater - if(PlatformUtils.isMac() && PlatformUtils.compareOSVersion("15.0") >= 0) { //$NON-NLS-1$ - // Flip the image - shell.setBackgroundImage(flipImage(shell.getDisplay(), shell.getBackgroundImage())); - - // We are now responsible for disposing the new image - shell.addDisposeListener(e -> { - shell.getBackgroundImage().dispose(); - }); - } - } - - /** - * From https://github.com/knime/knime-product/commit/095c88e22ba6d84e22a480f50734141836098169 - */ - private Image flipImage(Display display, Image srcImage) { - Rectangle bounds = srcImage.getBounds(); - Image newImage = new Image(display, bounds.width, bounds.height); - - GC gc = new GC(newImage); - gc.setAdvanced(true); - gc.setAntialias(SWT.ON); - gc.setInterpolation(SWT.HIGH); - - Transform transform = new Transform(display); - // flip down - transform.setElements(1, 0, 0, -1, 0, 0); - // move up - transform.translate(0, -bounds.height); - gc.setTransform(transform); - - gc.drawImage(srcImage, 0, 0, bounds.width, bounds.height, - 0, 0, bounds.width, bounds.height); - - gc.dispose(); - transform.dispose(); - - return newImage; - } + } } diff --git a/pom.xml b/pom.xml index 153f6bae5..ca8aeedb9 100644 --- a/pom.xml +++ b/pom.xml @@ -18,10 +18,15 @@ + + Eclipse I-build + p2 + https://download.eclipse.org/eclipse/updates/4.31-I-builds + Eclipse p2 - https://download.eclipse.org/releases/2023-12 + https://download.eclipse.org/releases/2024-03