From 8efcd50ca11936417f027f3d3ab004a3f79a8079 Mon Sep 17 00:00:00 2001 From: Andrew Obuchowicz Date: Mon, 21 Dec 2020 15:39:58 -0500 Subject: [PATCH 1/2] switch to elementary tab renderer Signed-off-by: Andrew Obuchowicz --- com.aobuchow.themes.spectrum/css/tabstyle.css | 56 +++++++------------ 1 file changed, 21 insertions(+), 35 deletions(-) diff --git a/com.aobuchow.themes.spectrum/css/tabstyle.css b/com.aobuchow.themes.spectrum/css/tabstyle.css index 0cc584c..aa6644a 100644 --- a/com.aobuchow.themes.spectrum/css/tabstyle.css +++ b/com.aobuchow.themes.spectrum/css/tabstyle.css @@ -11,15 +11,13 @@ *******************************************************************************/ CTabFolder { - swt-tab-renderer: url('bundleclass://org.eclipse.e4.ui.workbench.renderers.swt/org.eclipse.e4.ui.workbench.renderers.swt.CTabRendering'); - swt-selected-tab-fill: '#com-aobuchow-themes-spectrum-BASE_COLOR' - '#com-aobuchow-themes-spectrum-BASE_COLOR' 100% 100%; /* title background for selected tab */ - swt-unselected-tabs-color: '#com-aobuchow-themes-spectrum-BASE_COLOR' - '#com-aobuchow-themes-spectrum-BASE_COLOR' 100% 100%; /* title background for unselected tab */ + swt-tab-renderer: url('bundleclass://io.github.pyvesb.elementary_tab_renderer/io.github.pyvesb.elementary_tab_renderer.ElementaryCTabFolderRenderer'); + swt-selected-tab-fill: '#com-aobuchow-themes-spectrum-BASE_COLOR'; /* title background for selected tab */ + swt-unselected-tabs-color: '#com-aobuchow-themes-spectrum-BASE_COLOR'; /* title background for unselected tab */ swt-outer-keyline-color: '#com-aobuchow-themes-spectrum-BASE_COLOR'; /* border color for whole tabs container */ swt-inner-keyline-color: '#com-aobuchow-themes-spectrum-BASE_COLOR'; swt-tab-outline: #0f1114; - padding: 2px 2px; + padding: 2px 2px; /* this affects the size of the tab outline */ swt-shadow-visible: false; swt-mru-visible: true; swt-simple: true; @@ -41,52 +39,40 @@ CTabFolder[style~='SWT.DOWN'][style~='SWT.BOTTOM'] { } .MPartStack.active { - swt-selected-tab-fill: '#com-aobuchow-themes-spectrum-ACCENT_COLOR' - '#com-aobuchow-themes-spectrum-ACCENT_COLOR' 100% 100%; /* title background for selected tab */ - swt-unselected-tabs-color: '#com-aobuchow-themes-spectrum-BASE_COLOR' - '#com-aobuchow-themes-spectrum-BASE_COLOR' 100% 100%; /* title background for unselected tab */ + swt-selected-tab-fill: '#com-aobuchow-themes-spectrum-ACCENT_COLOR'; /* title background for selected tab */ + swt-unselected-tabs-color: '#com-aobuchow-themes-spectrum-BASE_COLOR'; /* title background for unselected tab */ swt-outer-keyline-color: '#com-aobuchow-themes-spectrum-BASE_COLOR'; /* border color for whole tabs container */ swt-inner-keyline-color: '#com-aobuchow-themes-spectrum-BASE_COLOR'; swt-tab-outline: '#com-aobuchow-themes-spectrum-ACCENT_COLOR'; /* border color for selected tab */ } .MPartStack.empty { - swt-unselected-tabs-color: '#com-aobuchow-themes-spectrum-BASE_COLOR' #4f5456 - #4f5456 99% 100%; /* title background for unselected tab */ + swt-unselected-tabs-color: '#com-aobuchow-themes-spectrum-BASE_COLOR'; swt-tab-outline: #535354; /* border color for selected tab */ swt-outer-keyline-color: #17171b; /* border color for whole tabs container */ } -.MPartStack.active > CTabItem, -.MPartStack.active > CTabItem CLabel { - background-color: '#com-aobuchow-themes-spectrum-ACCENT_COLOR'; /* HACK for background of CTabFolder inner Toolbars */ - color: '#org-eclipse-ui-workbench-ACTIVE_TAB_SELECTED_TEXT_COLOR'; -} - -.MPartStack.active > CTabItem:selected, -.MPartStack.active > CTabItem:selected CLabel { - color: '#org-eclipse-ui-workbench-ACTIVE_TAB_SELECTED_TEXT_COLOR'; -} - -CTabFolder > Composite#ToolbarComposite { - background-color: '#com-aobuchow-themes-spectrum-BASE_COLOR'; /* HACK for background of CTabFolder inner Toolbars */ -} -CTabFolder.active > Composite#ToolbarComposite { - background-color: '#com-aobuchow-themes-spectrum-ACCENT_COLOR'; /* Required when resizing a view with a toolbar that is active */ + Composite > CTabFolder > ToolBar, + Composite > CTabFolder > Composite > ToolBar { + background-color: '#com-aobuchow-themes-spectrum-BASE_COLOR'; } -CTabFolder.MArea CTabItem, -CTabFolder.MArea CTabItem CLabel { - background-color: '#com-aobuchow-themes-spectrum-BASE_COLOR'; /* Disable HACK for background of CTabFolder inner Toolbars */ +Composite > CTabFolder.active > ToolBar, +Composite > CTabFolder.active > Composite > ToolBar { + background-color: '#com-aobuchow-themes-spectrum-ACCENT_COLOR'; } -CTabFolder Scale { - background-color: inherit; +/*.MPartStack.active > CTabItem, +.MPartStack.active > CTabItem CLabel { + background-color: '#com-aobuchow-themes-spectrum-ACCENT_COLOR'; + color: '#org-eclipse-ui-workbench-ACTIVE_TAB_SELECTED_TEXT_COLOR'; } - +*/ CTabItem, CTabItem CLabel { - background-color: '#com-aobuchow-themes-spectrum-BASE_COLOR'; /* HACK for background of CTabFolder inner Toolbars */ + background-color: '#com-aobuchow-themes-spectrum-BASE_COLOR'; color: '#org-eclipse-ui-workbench-ACTIVE_TAB_SELECTED_TEXT_COLOR'; } + + From 332f20b7a0e4696f9b06e2d5149db0551012a47a Mon Sep 17 00:00:00 2001 From: Andrew Obuchowicz Date: Mon, 11 Jan 2021 23:47:24 -0500 Subject: [PATCH 2/2] keep old css, use new tab renderer Signed-off-by: Andrew Obuchowicz --- com.aobuchow.themes.spectrum/css/tabstyle.css | 53 ++++++++++++------- 1 file changed, 34 insertions(+), 19 deletions(-) diff --git a/com.aobuchow.themes.spectrum/css/tabstyle.css b/com.aobuchow.themes.spectrum/css/tabstyle.css index aa6644a..4868a42 100644 --- a/com.aobuchow.themes.spectrum/css/tabstyle.css +++ b/com.aobuchow.themes.spectrum/css/tabstyle.css @@ -12,12 +12,14 @@ CTabFolder { swt-tab-renderer: url('bundleclass://io.github.pyvesb.elementary_tab_renderer/io.github.pyvesb.elementary_tab_renderer.ElementaryCTabFolderRenderer'); - swt-selected-tab-fill: '#com-aobuchow-themes-spectrum-BASE_COLOR'; /* title background for selected tab */ - swt-unselected-tabs-color: '#com-aobuchow-themes-spectrum-BASE_COLOR'; /* title background for unselected tab */ + swt-selected-tab-fill: '#com-aobuchow-themes-spectrum-BASE_COLOR' + '#com-aobuchow-themes-spectrum-BASE_COLOR' 100% 100%; /* title background for selected tab */ + swt-unselected-tabs-color: '#com-aobuchow-themes-spectrum-BASE_COLOR' + '#com-aobuchow-themes-spectrum-BASE_COLOR' 100% 100%; /* title background for unselected tab */ swt-outer-keyline-color: '#com-aobuchow-themes-spectrum-BASE_COLOR'; /* border color for whole tabs container */ swt-inner-keyline-color: '#com-aobuchow-themes-spectrum-BASE_COLOR'; swt-tab-outline: #0f1114; - padding: 2px 2px; /* this affects the size of the tab outline */ + padding: 2px 2px; swt-shadow-visible: false; swt-mru-visible: true; swt-simple: true; @@ -39,40 +41,53 @@ CTabFolder[style~='SWT.DOWN'][style~='SWT.BOTTOM'] { } .MPartStack.active { - swt-selected-tab-fill: '#com-aobuchow-themes-spectrum-ACCENT_COLOR'; /* title background for selected tab */ - swt-unselected-tabs-color: '#com-aobuchow-themes-spectrum-BASE_COLOR'; /* title background for unselected tab */ + swt-selected-tab-fill: '#com-aobuchow-themes-spectrum-ACCENT_COLOR' + '#com-aobuchow-themes-spectrum-ACCENT_COLOR' 100% 100%; /* title background for selected tab */ + swt-unselected-tabs-color: '#com-aobuchow-themes-spectrum-BASE_COLOR' + '#com-aobuchow-themes-spectrum-BASE_COLOR' 100% 100%; /* title background for unselected tab */ swt-outer-keyline-color: '#com-aobuchow-themes-spectrum-BASE_COLOR'; /* border color for whole tabs container */ swt-inner-keyline-color: '#com-aobuchow-themes-spectrum-BASE_COLOR'; swt-tab-outline: '#com-aobuchow-themes-spectrum-ACCENT_COLOR'; /* border color for selected tab */ } .MPartStack.empty { - swt-unselected-tabs-color: '#com-aobuchow-themes-spectrum-BASE_COLOR'; + swt-unselected-tabs-color: '#com-aobuchow-themes-spectrum-BASE_COLOR' #4f5456 + #4f5456 99% 100%; /* title background for unselected tab */ swt-tab-outline: #535354; /* border color for selected tab */ swt-outer-keyline-color: #17171b; /* border color for whole tabs container */ } +.MPartStack.active > CTabItem, +.MPartStack.active > CTabItem CLabel { + background-color: '#com-aobuchow-themes-spectrum-ACCENT_COLOR'; /* HACK for background of CTabFolder inner Toolbars */ + color: '#org-eclipse-ui-workbench-ACTIVE_TAB_SELECTED_TEXT_COLOR'; +} - Composite > CTabFolder > ToolBar, - Composite > CTabFolder > Composite > ToolBar { - background-color: '#com-aobuchow-themes-spectrum-BASE_COLOR'; +.MPartStack.active > CTabItem:selected, +.MPartStack.active > CTabItem:selected CLabel { + color: '#org-eclipse-ui-workbench-ACTIVE_TAB_SELECTED_TEXT_COLOR'; } -Composite > CTabFolder.active > ToolBar, -Composite > CTabFolder.active > Composite > ToolBar { - background-color: '#com-aobuchow-themes-spectrum-ACCENT_COLOR'; +CTabFolder > Composite#ToolbarComposite { + background-color: '#com-aobuchow-themes-spectrum-BASE_COLOR'; /* HACK for background of CTabFolder inner Toolbars */ } -/*.MPartStack.active > CTabItem, -.MPartStack.active > CTabItem CLabel { - background-color: '#com-aobuchow-themes-spectrum-ACCENT_COLOR'; - color: '#org-eclipse-ui-workbench-ACTIVE_TAB_SELECTED_TEXT_COLOR'; +CTabFolder.active > Composite#ToolbarComposite { + background-color: '#com-aobuchow-themes-spectrum-ACCENT_COLOR'; /* Required when resizing a view with a toolbar that is active */ +} + +CTabFolder.MArea CTabItem, +CTabFolder.MArea CTabItem CLabel { + background-color: '#com-aobuchow-themes-spectrum-BASE_COLOR'; /* Disable HACK for background of CTabFolder inner Toolbars */ } -*/ + +CTabFolder Scale { + background-color: inherit; +} + CTabItem, CTabItem CLabel { - background-color: '#com-aobuchow-themes-spectrum-BASE_COLOR'; + background-color: '#com-aobuchow-themes-spectrum-BASE_COLOR'; /* HACK for background of CTabFolder inner Toolbars */ color: '#org-eclipse-ui-workbench-ACTIVE_TAB_SELECTED_TEXT_COLOR'; } -