Skip to content

OpenToonz - An open-source full-featured 2D animation creation software

C

Fix QTabWidget Pane Border

konero44e65080d8d6
diff --git a/stuff/config/qss/Blue/Blue.qss b/stuff/config/qss/Blue/Blue.qss
index 94baa8f5c..083e4b95e 100644
--- a/stuff/config/qss/Blue/Blue.qss
+++ b/stuff/config/qss/Blue/Blue.qss
@@ -98,6 +98,7 @@ PaletteViewer QToolBar QToolButton:pressed {
Component: Frames
----------------------------------------------------------------------------- */
.frame,
+QTabWidget::Pane,
.GroupBox,
#LoadLevelFrame,
#PsdSettingsGroupBox,
@@ -666,12 +667,16 @@ DvScrollWidget {
qproperty-BottomAboveLineColor: #323435;
qproperty-BottomBelowLineColor: #262728;
}
-QTabBar {
- background-color: #323435;
+QTabWidget::Pane {
+ position: absolute;
+ top: -1;
}
/* -----------------------------------------------------------------------------
Tabs
----------------------------------------------------------------------------- */
+QTabBar {
+ background-color: #323435;
+}
QTabBar QToolButton {
/* Scroll buttons */
margin: 0;
diff --git a/stuff/config/qss/Dark/Dark.qss b/stuff/config/qss/Dark/Dark.qss
index e7b2a5b91..fb3c565ca 100644
--- a/stuff/config/qss/Dark/Dark.qss
+++ b/stuff/config/qss/Dark/Dark.qss
@@ -98,6 +98,7 @@ PaletteViewer QToolBar QToolButton:pressed {
Component: Frames
----------------------------------------------------------------------------- */
.frame,
+QTabWidget::Pane,
.GroupBox,
#LoadLevelFrame,
#PsdSettingsGroupBox,
@@ -666,12 +667,16 @@ DvScrollWidget {
qproperty-BottomAboveLineColor: #262626;
qproperty-BottomBelowLineColor: #111111;
}
-QTabBar {
- background-color: #262626;
+QTabWidget::Pane {
+ position: absolute;
+ top: -1;
}
/* -----------------------------------------------------------------------------
Tabs
----------------------------------------------------------------------------- */
+QTabBar {
+ background-color: #262626;
+}
QTabBar QToolButton {
/* Scroll buttons */
margin: 0;
diff --git a/stuff/config/qss/Default/Default.qss b/stuff/config/qss/Default/Default.qss
index 916f2f3c6..987514622 100644
--- a/stuff/config/qss/Default/Default.qss
+++ b/stuff/config/qss/Default/Default.qss
@@ -98,6 +98,7 @@ PaletteViewer QToolBar QToolButton:pressed {
Component: Frames
----------------------------------------------------------------------------- */
.frame,
+QTabWidget::Pane,
.GroupBox,
#LoadLevelFrame,
#PsdSettingsGroupBox,
@@ -666,12 +667,16 @@ DvScrollWidget {
qproperty-BottomAboveLineColor: #393939;
qproperty-BottomBelowLineColor: #2c2c2c;
}
-QTabBar {
- background-color: #393939;
+QTabWidget::Pane {
+ position: absolute;
+ top: -1;
}
/* -----------------------------------------------------------------------------
Tabs
----------------------------------------------------------------------------- */
+QTabBar {
+ background-color: #393939;
+}
QTabBar QToolButton {
/* Scroll buttons */
margin: 0;
diff --git a/stuff/config/qss/Default/less/layouts/mainwindow.less b/stuff/config/qss/Default/less/layouts/mainwindow.less
index 610f44445..cfb5745be 100644
--- a/stuff/config/qss/Default/less/layouts/mainwindow.less
+++ b/stuff/config/qss/Default/less/layouts/mainwindow.less
@@ -523,8 +523,10 @@ DvScrollWidget {
.tab-container;
}
-QTabBar {
- background-color: @tabbar-bg-color;
+QTabWidget::Pane {
+ position: absolute;
+ top: -1; // move border under tabs
+ &:extend(.frame all); // frame border
}
/* -----------------------------------------------------------------------------
@@ -532,6 +534,7 @@ QTabBar {
----------------------------------------------------------------------------- */
QTabBar {
+ background-color: @tabbar-bg-color;
&::tab {
&:extend(.tab-flat all);
}
diff --git a/stuff/config/qss/Light/Light.qss b/stuff/config/qss/Light/Light.qss
index fad1b69c5..1fb6b6270 100644
--- a/stuff/config/qss/Light/Light.qss
+++ b/stuff/config/qss/Light/Light.qss
@@ -98,6 +98,7 @@ PaletteViewer QToolBar QToolButton:pressed {
Component: Frames
----------------------------------------------------------------------------- */
.frame,
+QTabWidget::Pane,
.GroupBox,
#LoadLevelFrame,
#PsdSettingsGroupBox,
@@ -666,12 +667,16 @@ DvScrollWidget {
qproperty-BottomAboveLineColor: #c4c4c4;
qproperty-BottomBelowLineColor: #a8a8a8;
}
-QTabBar {
- background-color: #c4c4c4;
+QTabWidget::Pane {
+ position: absolute;
+ top: -1;
}
/* -----------------------------------------------------------------------------
Tabs
----------------------------------------------------------------------------- */
+QTabBar {
+ background-color: #c4c4c4;
+}
QTabBar QToolButton {
/* Scroll buttons */
margin: 0;
diff --git a/stuff/config/qss/Neutral/Neutral.qss b/stuff/config/qss/Neutral/Neutral.qss
index 823f65357..0f9b3a912 100644
--- a/stuff/config/qss/Neutral/Neutral.qss
+++ b/stuff/config/qss/Neutral/Neutral.qss
@@ -98,6 +98,7 @@ PaletteViewer QToolBar QToolButton:pressed {
Component: Frames
----------------------------------------------------------------------------- */
.frame,
+QTabWidget::Pane,
.GroupBox,
#LoadLevelFrame,
#PsdSettingsGroupBox,
@@ -666,12 +667,16 @@ DvScrollWidget {
qproperty-BottomAboveLineColor: #717171;
qproperty-BottomBelowLineColor: #5a5a5a;
}
-QTabBar {
- background-color: #717171;
+QTabWidget::Pane {
+ position: absolute;
+ top: -1;
}
/* -----------------------------------------------------------------------------
Tabs
----------------------------------------------------------------------------- */
+QTabBar {
+ background-color: #717171;
+}
QTabBar QToolButton {
/* Scroll buttons */
margin: 0;