Fixes #3187 with an explicit flag to turn off the "new style" tabs

gama-platform · Sep 10, 2021 · 913ea62 · 913ea62
1 parent 3aa8de6
commit 913ea62
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 55 deletions.
diff --git a/msi.gama.application/plugin.xml b/msi.gama.application/plugin.xml
@@ -139,34 +139,7 @@
                </property>
             </product>
          </extension>
-                     <extension
-         point="org.eclipse.e4.ui.css.swt.theme">
-      <stylesheet
-            uri="css/tabs.css">
-         <themeid
-               refid="org.eclipse.e4.ui.css.theme.e4_default">
-         </themeid>
-         <themeid
-               refid="org.eclipse.e4.ui.css.theme.e4_classic">
-         </themeid>
-         <themeid
-               refid="org.eclipse.e4.ui.css.theme.e4_dark">
-         </themeid>
-         <themeid
-               refid="org.eclipse.e4.ui.css.theme.e4_system">
-         </themeid>
-      </stylesheet>
-   </extension>
-            <extension
-                  id="gama.theming"
-                  name="Dark theme for GAMA"
-                  point="org.eclipse.e4.ui.css.swt.theme">
-               <theme
-                     basestylesheeturi="msi.gama.application.theme1"
-                     id="gama.dark.theme"
-                     label="Gama Dark Theme">
-               </theme>
-            </extension>
+
          <extension
                id="testNature"
                name="GAMA test project"

diff --git a/...ama.application/src/msi/gama/application/workbench/ApplicationWorkbenchWindowAdvisor.java b/...ama.application/src/msi/gama/application/workbench/ApplicationWorkbenchWindowAdvisor.java
@@ -32,6 +32,7 @@
 import msi.gama.common.interfaces.IGui;
 import msi.gama.common.preferences.GamaPreferences;
 import msi.gama.runtime.GAMA;
+import ummisco.gama.dev.utils.FLAGS;
 
 /**
  * The Class ApplicationWorkbenchWindowAdvisor.
@@ -101,6 +102,10 @@ public void pageClosed(final IWorkbenchPage page) {}
 			@Override
 			public void pageOpened(final IWorkbenchPage page) {}
 		});
+		// See #3187 -
+		if (FLAGS.USE_OLD_TABS) {
+			ThemeHelper.injectCSS(".MPartStack {\n" + " swt-tab-renderer: null;\n" + " swt-simple: true;\n" + "}");
+		}
 		configurer.setShowMenuBar(true);
 		configurer.setShowCoolBar(true);
 		configurer.setShowStatusLine(true);

diff --git a/msi.gama.application/src/msi/gama/application/workbench/ThemeHelper.java b/msi.gama.application/src/msi/gama/application/workbench/ThemeHelper.java
@@ -43,8 +43,8 @@
 import org.osgi.service.event.EventHandler;
 import org.osgi.service.prefs.BackingStoreException;
 import org.w3c.css.sac.CSSParseException;
-import org.w3c.dom.stylesheets.StyleSheet;
-import org.w3c.dom.stylesheets.StyleSheetList;
+
+import com.google.common.collect.Iterables;
 
 import msi.gama.common.preferences.Pref;
 import msi.gaml.types.IType;
@@ -196,7 +196,6 @@ public static void install() {
 			eventBroker.subscribe(IThemeEngine.Events.THEME_CHANGED, themeChangedHandler);
 		}
 		chooseThemeBasedOnPreferences();
-		// injectCSS(".MPartStack {\n" + " swt-tab-renderer: null;\n" + " swt-simple: true;\n" + "}");
 	}
 
 	/**
@@ -301,32 +300,28 @@ private static ThemeEngine getThemeEngine() {
 	 */
 	public static void injectCSS(final String cssText) {
 		StringBuilder sb = new StringBuilder();
-		// FIXME: expose these new protocols: resetCurrentTheme() and
-		// getCSSEngines()
 		getThemeEngine().resetCurrentTheme();
+		CSSEngine engine = Iterables.getFirst(getThemeEngine().getCSSEngines(), null);
+		if (engine == null) return;
+		// sb.append("Engine[").append(engine.getClass().getSimpleName()).append("]");
+		ExtendedDocumentCSS doc = (ExtendedDocumentCSS) engine.getDocumentCSS();
+		// List<StyleSheet> sheets = new ArrayList<>();
+		// StyleSheetList list = doc.getStyleSheets();
+		// for (int i = 0; i < list.getLength(); i++) { sheets.add(list.item(i)); }
 
-		int count = 0;
-		for (CSSEngine engine : getThemeEngine().getCSSEngines()) {
-			if (count++ > 0) { sb.append("\n\n"); }
-			sb.append("Engine[").append(engine.getClass().getSimpleName()).append("]");
-			ExtendedDocumentCSS doc = (ExtendedDocumentCSS) engine.getDocumentCSS();
-			List<StyleSheet> sheets = new ArrayList<>();
-			StyleSheetList list = doc.getStyleSheets();
-			for (int i = 0; i < list.getLength(); i++) { sheets.add(list.item(i)); }
-
-			try {
-				Reader reader = new StringReader(cssText);
-				sheets.add(0, engine.parseStyleSheet(reader));
-				doc.removeAllStyleSheets();
-				for (StyleSheet sheet : sheets) { doc.addStyleSheet(sheet); }
-				engine.reapply();
-
-			} catch (CSSParseException e) {
-				sb.append("\nError: line ").append(e.getLineNumber()).append(" col ").append(e.getColumnNumber())
-						.append(": ").append(e.getLocalizedMessage());
-			} catch (IOException e) {
-				sb.append("\nError: ").append(e.getLocalizedMessage());
-			}
+		try {
+			Reader reader = new StringReader(cssText);
+			doc.addStyleSheet(engine.parseStyleSheet(reader));
+			// sheets.add(/* 0, */ engine.parseStyleSheet(reader));
+			// doc.removeAllStyleSheets();
+			// for (StyleSheet sheet : sheets) { doc.addStyleSheet(sheet); }
+			engine.reapply();
+
+		} catch (CSSParseException e) {
+			sb.append("\nError: line ").append(e.getLineNumber()).append(" col ").append(e.getColumnNumber())
+					.append(": ").append(e.getLocalizedMessage());
+		} catch (IOException e) {
+			sb.append("\nError: ").append(e.getLocalizedMessage());
 		}
 	}
 

diff --git a/ummisco.gama.annotations/src/ummisco/gama/dev/utils/FLAGS.java b/ummisco.gama.annotations/src/ummisco/gama/dev/utils/FLAGS.java
@@ -83,4 +83,10 @@ private static boolean get(final String name, final boolean def) {
 	 */
 	public static final boolean IS_READ_ONLY = get("read_only", false);
 
+	/**
+	 * Used in msi.gama.application.workbench.ApplicationWorkbenchWindowAdvisor to impose the use of the "classic" view
+	 * tabs (with a visible border) and inject a specific CSS stylesheet. See #3187. True by default.
+	 */
+	public static final boolean USE_OLD_TABS = get("use_old_tabs", true);
+
 }