Drop flat scrollbars from Xiliary

PyvesB · Jun 16, 2024 · 5a69ceb · 5a69ceb
1 parent d512c2a
commit 5a69ceb
Show file tree

Hide file tree

Showing 73 changed files with 4 additions and 337 deletions.
diff --git a/README.md b/README.md
@@ -28,7 +28,7 @@ Three themes are currently available:
 * Pluto: not much light reaches this distant dwarf planet, leading to a resolutely dark theme. The presence of purple has yet to be explained by astronomers.
 
 A few words to summarise the planetary ambitions:
-* compact: few borders, less visual artifacts, hidden buttons and flat scrollbars on Windows.
+* compact: few borders, less visual artifacts, and hidden buttons.
 * readable: easy on the eyes with low glare, balanced contrasts and an integrated editor font with programming ligatures.
 * outstanding: not a revolution, but hopefully a nice twist to the traditional Eclipse look and feel.
 
@@ -71,6 +71,4 @@ Setting up your own working copy of the project is easy:
 
 Planet Themes are licensed under Eclipse Public License - v 2.0.
 
-The following third-party projects are being used, many thanks to them:
-* [Xiliary](https://github.com/fappel/xiliary) by [Frank Appel](https://github.com/fappel): flat scrollbars on Windows (Eclipse Public License).
-* [Fira Code](https://github.com/tonsky/FiraCode) by [Nikita Prokopov](https://github.com/tonsky): editor font (Open Font License).
+[Fira Code](https://github.com/tonsky/FiraCode) (Open Font License) is being used as the editor font, many thanks to [Nikita Prokopov](https://github.com/tonsky) and other contributors!
diff --git a/p2.index b/p2.index
diff --git a/p2artifacts.xml b/p2artifacts.xml
diff --git a/p2content.xml b/p2content.xml
diff --git a/planet-themes-feature/feature.xml b/planet-themes-feature/feature.xml
@@ -299,44 +299,4 @@ version(s), and exceptions or additional permissions here}.&quot;
          install-size="0"
          version="0.2.6"
          unpack="false"/>
-
-   <plugin
-         id="com.codeaffine.eclipse.swt"
-         download-size="188"
-         install-size="188"
-         version="0.6.0.20200802-1642"
-         unpack="false"/>
-
-   <plugin
-         id="com.codeaffine.eclipse.swt.win"
-         os="win32"
-         download-size="2"
-         install-size="2"
-         version="0.6.0.20200802-1642"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="com.codeaffine.eclipse.ui.swt.theme"
-         download-size="40"
-         install-size="40"
-         version="0.8.0.20200802-1642"
-         unpack="false"/>
-
-   <plugin
-         id="com.codeaffine.eclipse.ui.swt.theme.win"
-         os="win32"
-         download-size="1"
-         install-size="1"
-         version="0.8.0.20200802-1642"
-         fragment="true"
-         unpack="false"/>
-
-   <plugin
-         id="com.codeaffine.util"
-         download-size="8"
-         install-size="8"
-         version="0.1.0.20200802-1642"
-         unpack="false"/>
-
 </feature>
diff --git a/planet-themes-plugin/META-INF/MANIFEST.MF b/planet-themes-plugin/META-INF/MANIFEST.MF
@@ -12,6 +12,5 @@ Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.ui,
  org.eclipse.e4.ui.css.swt,
  org.eclipse.e4.ui.css.swt.theme,
- org.eclipse.osgi,
- com.codeaffine.eclipse.ui.swt.theme;resolution:=optional
+ org.eclipse.osgi
 Export-Package: com.codeaffine.eclipse.ui.swt.theme
diff --git a/planet-themes-plugin/css/planets-win.css b/planet-themes-plugin/css/planets-win.css
@@ -1,20 +1,7 @@
 Tree, Table {
-  flat-scroll-bar: true;
-  flat-scroll-bar-thumb: '#io-github-pyvesb-eclipse_planet_themes-ACCENT_COLOR';
-  flat-scroll-bar-thumb-top-level: '#io-github-pyvesb-eclipse_planet_themes-ACCENT_COLOR';
-  flat-scroll-bar-page-increment: '#io-github-pyvesb-eclipse_planet_themes-INTERACTION_COLOR';
-  flat-scroll-bar-page-increment-top-level: '#io-github-pyvesb-eclipse_planet_themes-INTERACTION_COLOR';
   swt-lines-visible: false;
 }
 
-StyledText, ScrolledComposite, ScrolledForm, Shell > Table {
-  flat-scroll-bar: true;
-  flat-scroll-bar-thumb: '#io-github-pyvesb-eclipse_planet_themes-ACCENT_COLOR';
-  flat-scroll-bar-thumb-top-level: '#io-github-pyvesb-eclipse_planet_themes-ACCENT_COLOR';
-  flat-scroll-bar-page-increment: '#io-github-pyvesb-eclipse_planet_themes-BACKGROUND_COLOR';
-  flat-scroll-bar-page-increment-top-level: '#io-github-pyvesb-eclipse_planet_themes-BACKGROUND_COLOR';
-}
-
 FontDefinition#org-eclipse-jface-textfont,
 FontDefinition#org-eclipse-ui-workbench-texteditor-blockSelectionModeFont,
 FontDefinition#org-eclipse-jdt-ui-editors-textfont {

diff --git a/planet-themes-plugin/css/planets.css b/planet-themes-plugin/css/planets.css
@@ -102,7 +102,7 @@ ColorDefinition#io-github-pyvesb-eclipse_planet_themes-BACKGROUND_COLOR {
 ColorDefinition#io-github-pyvesb-eclipse_planet_themes-ACCENT_COLOR {
   category: '#io-github-pyvesb-eclipse_planet_themes-themeElementCategory';
   label: 'Accent Color';
-  description: 'The color for tab highlights, keylines and scrollbars on Windows.';
+  description: 'The color for tab highlights and keylines.';
 }
 
 ColorDefinition#io-github-pyvesb-eclipse_planet_themes-INTERACTION_COLOR {

diff --git a/planet-themes-targetplatform/planet-themes-targetplatform.target b/planet-themes-targetplatform/planet-themes-targetplatform.target
@@ -15,8 +15,5 @@
 			<unit id="org.eclipse.osgi" version="0.0.0"/>
 			<unit id="com.google.gson" version="0.0.0"/>
 		</location>
-		<location path="${project_loc:/planet-themes-targetplatform}/xiliary" type="Directory">
-			<unit id="com.codeaffine.eclipse.ui.swt.theme.feature.feature.group" version="0.8.0.20200802-1642"/>
-		</location>
 	</locations>
 </target>