Update theme needs repaint; limit wxColour conversion

cjcliffe · Dec 27, 2016 · 1ec92e0 · 1ec92e0
1 parent 83cb265
commit 1ec92e0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/src/forms/Bookmark/BookmarkView.cpp b/src/forms/Bookmark/BookmarkView.cpp
@@ -153,6 +153,8 @@ void BookmarkView::updateTheme() {
     m_treeView->SetForegroundColour(textColor);
 
     m_propPanel->SetBackgroundColour(bgColor);
+    m_buttonPanel->SetBackgroundColour(bgColor);
+
     m_propPanel->SetForegroundColour(textColor);
 
     m_labelLabel->SetForegroundColour(textColor);
@@ -163,7 +165,7 @@ void BookmarkView::updateTheme() {
     m_modulationVal->SetForegroundColour(textColor);
     m_modulationLabel->SetForegroundColour(textColor);
 
-    m_buttonPanel->SetBackgroundColour(bgColor);
+    refreshLayout();
 }
 
 
@@ -653,6 +655,7 @@ void BookmarkView::showButtons() {
 void BookmarkView::refreshLayout() {
     GetSizer()->Layout();
     Update();
+    Refresh();
 }
 
 

diff --git a/src/visual/ColorTheme.h b/src/visual/ColorTheme.h
@@ -42,9 +42,9 @@ class RGBA4f {
 
     operator wxColour() {
         return wxColour(
-                       (unsigned char) (r * 255.0),
-                       (unsigned char) (g * 255.0),
-                       (unsigned char) (b * 255.0));
+                        (unsigned char) std::min((r * 255.0), 255.0),
+                       (unsigned char) std::min((g * 255.0), 255.0),
+                       (unsigned char) std::min((b * 255.0), 255.0));
 
     }