diff --git a/bin/app/data/color_schemes/bad_rainbow.xml b/bin/app/data/color_schemes/bad_rainbow.xml index efdc2a85..d2226711 100644 --- a/bin/app/data/color_schemes/bad_rainbow.xml +++ b/bin/app/data/color_schemes/bad_rainbow.xml @@ -82,11 +82,12 @@ - #494949 + #595959 + #494949 #A0A0A0 - #CCCCCC + #999 diff --git a/bin/app/data/color_schemes/bright.xml b/bin/app/data/color_schemes/bright.xml index 9b98a918..dfbb3ec6 100644 --- a/bin/app/data/color_schemes/bright.xml +++ b/bin/app/data/color_schemes/bright.xml @@ -82,20 +82,21 @@ - white + #F6F6F6 + white #A2A2A2 - #A2A2A2 + #D2D2D2 - #E0E0E0 + #D0D0D0 <text>black</text> - <normal>#E0E0E0</normal> - <hover>#C2C2C2</hover> + <normal>#D0D0D0</normal> + <hover>#B2B2B2</hover> <press>#A2A2A2</press> <icon>black</icon> <border>white</border> diff --git a/bin/app/data/color_schemes/dark.xml b/bin/app/data/color_schemes/dark.xml index 7d314258..c1215819 100644 --- a/bin/app/data/color_schemes/dark.xml +++ b/bin/app/data/color_schemes/dark.xml @@ -2,7 +2,7 @@ <config> <window> - <separator>#CCC</separator> + <separator>#AAA</separator> <scrollbar> <background>transparent</background> <handle>#80999999</handle> @@ -15,8 +15,8 @@ <button> <normal>#555555</normal> - <hover>#4A4A4A</hover> - <press>#404040</press> + <hover>#404040</hover> + <press>#3A3A3A</press> <disabled>#333333</disabled> <icon>white</icon> <icon_disabled>#777777</icon_disabled> @@ -33,7 +33,7 @@ <text>#F7F7F7</text> <by_text>#A0A0A0</by_text> <background>#272728</background> - <highlight>#4A4A4A</highlight> + <highlight>#333333</highlight> <line>#4A4A4A</line> </popup> @@ -82,19 +82,20 @@ </search> <code> - <background>#272728</background> + <background>#313132</background> <navigation> + <background>#272728</background> <text>#A0A0A0</text> - <line>#CCC</line> + <line>#525253</line> </navigation> <file> - <background>#555555</background> + <background>#5C5C5C</background> <title> <text>#F7F7F7</text> - <normal>#555555</normal> + <normal>#5C5C5C</normal> <hover>#4A4A4A</hover> <press>#404040</press> <icon>white</icon> @@ -221,7 +222,7 @@ <node> <default> <fill> - <normal>#4D4D4D</normal> + <normal>#5A5A5A</normal> </fill> <border> <normal>#C3C3C3</normal> diff --git a/bin/app/data/gui/code_view/code_view.css b/bin/app/data/gui/code_view/code_view.css index 0acf8cb9..df4130d1 100644 --- a/bin/app/data/gui/code_view/code_view.css +++ b/bin/app/data/gui/code_view/code_view.css @@ -1,13 +1,21 @@ -#code_navigation, #code_container, #code_file_list, #code_file_single { +#code_container, #code_file_list { background-color: <color:code/background>; } +#code_file_single { + background-color: <color:code/snippet/background>; +} + +#code_navigation { + background-color: <color:code/navigation/background>; +} + #code_container, #code_file_list { border: none; } #separator_gap { - background-color: <color:code/background>; + background-color: <color:code/navigation/background>; border: none; } diff --git a/src/lib_gui/qt/element/QtCodeNavigator.cpp b/src/lib_gui/qt/element/QtCodeNavigator.cpp index 791f6d53..dcaff526 100644 --- a/src/lib_gui/qt/element/QtCodeNavigator.cpp +++ b/src/lib_gui/qt/element/QtCodeNavigator.cpp @@ -89,27 +89,13 @@ QtCodeNavigator::QtCodeNavigator(QWidget* parent) navigation->setLayout(navLayout); layout->addWidget(navigation); - QHBoxLayout* separatorLayout = new QHBoxLayout(); - - QWidget* widget = new QWidget(); - widget->setObjectName("separator_gap"); - widget->setFixedWidth(7); - separatorLayout->addWidget(widget); - m_separatorLine = new QFrame(); m_separatorLine->setFrameShape(QFrame::HLine); m_separatorLine->setFrameShadow(QFrame::Plain); m_separatorLine->setObjectName("separator_line"); m_separatorLine->setFixedHeight(1); m_separatorLine->hide(); - separatorLayout->addWidget(m_separatorLine); - - QWidget* widget2 = new QWidget(); - widget2->setObjectName("separator_gap"); - widget2->setFixedWidth(7); - separatorLayout->addWidget(widget2); - - layout->addLayout(separatorLayout); + layout->addWidget(m_separatorLine); } m_list = new QtCodeFileList(this);