From 811429240b197d7f1a52561ba1fefc7c8037f391 Mon Sep 17 00:00:00 2001 From: Paul Fd Date: Thu, 30 Dec 2021 11:47:21 +0100 Subject: [PATCH] Correct some theming issues --- plugins/editor/layout/main.fl | 7 ++++--- plugins/editor/src/editor/Editor.cpp | 2 +- plugins/editor/src/editor/layout/main.hpp | 4 +++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/plugins/editor/layout/main.fl b/plugins/editor/layout/main.fl index 67c8bd25..bc4eeaf0 100644 --- a/plugins/editor/layout/main.fl +++ b/plugins/editor/layout/main.fl @@ -3,7 +3,7 @@ version 1.0304 header_name {.h} code_name {.cxx} widget_class mainView {open - xywh {607 439 800 475} type Double + xywh {624 612 800 475} type Double class LogicalGroup visible } { Fl_Box imageContainer_ { @@ -456,8 +456,9 @@ widget_class mainView {open xywh {5 110 790 285} hide class LogicalGroup } {} - Fl_Box lblHover_ {selected - xywh {15 105 155 25} labelsize 12 hide + Fl_Box lblHover_ { + comment {palette=invertedPalette} selected + xywh {5 105 170 25} labelsize 12 hide class HoverBox } } diff --git a/plugins/editor/src/editor/Editor.cpp b/plugins/editor/src/editor/Editor.cpp index a1674a97..a286981e 100644 --- a/plugins/editor/src/editor/Editor.cpp +++ b/plugins/editor/src/editor/Editor.cpp @@ -879,7 +879,7 @@ void Editor::Impl::createFrameContents() auto font = makeOwned("Roboto", fontsize); OnThemeChanged.push_back([lbl, palette]() { lbl->setFontColor(palette->valueText); - lbl->setBackColor(palette->boxBackground); + lbl->setBackColor(palette->valueBackground); lbl->setFrameColor(palette->valueText); }); lbl->setHoriAlign(align); diff --git a/plugins/editor/src/editor/layout/main.hpp b/plugins/editor/src/editor/layout/main.hpp index 03e5e579..09229775 100644 --- a/plugins/editor/src/editor/layout/main.hpp +++ b/plugins/editor/src/editor/layout/main.hpp @@ -238,7 +238,9 @@ auto* const view__91 = createLogicalGroup(CRect(5, 110, 795, 395), -1, "", kCent subPanels_[kPanelGeneral] = view__91; view__0->addView(view__91); view__91->setVisible(false); -auto* const view__92 = createHoverBox(CRect(15, 105, 170, 130), -1, "", kCenterText, 12); +enterPalette(invertedPalette); +auto* const view__92 = createHoverBox(CRect(5, 105, 175, 130), -1, "", kCenterText, 12); lblHover_ = view__92; view__0->addView(view__92); view__92->setVisible(false); +enterPalette(defaultPalette);