bugfix: fixed dropdown and checkbox colors when disabled

BlitterStudio · Sep 11, 2024 · a242e9f · a242e9f
1 parent 54c194b
commit a242e9f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/external/libguisan/src/widgets/checkbox.cpp b/external/libguisan/src/widgets/checkbox.cpp
@@ -100,7 +100,7 @@ namespace gcn
 
         const int h = getHeight() + getHeight() / 2;
 
-        graphics->drawText(getCaption(), h - 2, 1);
+        graphics->drawText(getCaption(), h - 2, 1, Graphics::Left, isEnabled());
     }
 
     void CheckBox::drawBox(Graphics* graphics)

diff --git a/external/libguisan/src/widgets/dropdown.cpp b/external/libguisan/src/widgets/dropdown.cpp
@@ -192,7 +192,7 @@ namespace gcn
         graphics->setFont(getFont());
 
         if (mListBox->getListModel() && mListBox->getSelected() >= 0)
-            graphics->drawText(mListBox->getListModel()->getElementAt(mListBox->getSelected()), 1, 0);
+            graphics->drawText(mListBox->getListModel()->getElementAt(mListBox->getSelected()), 1, 0, Graphics::Left, isEnabled());
 
         // Push a clip area before drawing the button.
         graphics->pushClipArea(Rectangle(currentClipArea.width - currentClipArea.height,
@@ -256,7 +256,10 @@ namespace gcn
         graphics->fillRectangle(
             Rectangle(1, 1, currentClipArea.width - 2, currentClipArea.height - 2));
 
-        graphics->setColor(getForegroundColor());
+		if (isEnabled())
+			graphics->setColor(getForegroundColor());
+        else
+			graphics->setColor(Color(128, 128, 128));
 
         int i;
         int n = currentClipArea.height / 3;