Merge pull request #87 from kallisti5/fix-widgets-disabled-color

Fix some widgets who didn't use the right color when disabled
kallisti5 · Sep 13, 2024 · ebe8376 · ebe8376
2 parents cfbe6eb + 58be71b
commit ebe8376
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 6 deletions.
diff --git a/src/widgets/imagebutton.cpp b/src/widgets/imagebutton.cpp
@@ -153,7 +153,10 @@ namespace gcn
         graphics->drawLine(getWidth() - 1, 1, getWidth() - 1, getHeight() - 1);
         graphics->drawLine(1, getHeight() - 1, getWidth() - 1, getHeight() - 1);
 
-        graphics->setColor(getForegroundColor());
+        if (isEnabled())
+            graphics->setColor(getForegroundColor());
+        else
+            graphics->setColor(Color(128, 128, 128));
 
         const int textX = getWidth() / 2 - (mImage ? mImage->getWidth() : 0) / 2;
         const int textY = getHeight() / 2 - (mImage ? mImage->getHeight() : 0) / 2;

diff --git a/src/widgets/imagetextbutton.cpp b/src/widgets/imagetextbutton.cpp
@@ -162,7 +162,10 @@ namespace gcn
         graphics->drawLine(getWidth() - 1, 1, getWidth() - 1, getHeight() - 1);
         graphics->drawLine(1, getHeight() - 1, getWidth() - 1, getHeight() - 1);
 
-        graphics->setColor(getForegroundColor());
+        if (isEnabled())
+            graphics->setColor(getForegroundColor());
+        else
+            graphics->setColor(Color(128, 128, 128));
 
         int imageX, imageY;
         int textX, textY;

diff --git a/src/widgets/inputbox.cpp b/src/widgets/inputbox.cpp
@@ -225,7 +225,10 @@ namespace gcn
               throw GCN_EXCEPTION("Unknown alignment.");
         }
 
-        graphics->setColor(getForegroundColor());
+        if (isEnabled())
+            graphics->setColor(getForegroundColor());
+        else
+            graphics->setColor(Color(128, 128, 128));
         graphics->setFont(getFont());
         graphics->pushClipArea(Rectangle(0, 0, getWidth(), getTitleBarHeight() - 1));
         graphics->drawText(getCaption(), textX, textY, getAlignment(), isEnabled());

diff --git a/src/widgets/radiobutton.cpp b/src/widgets/radiobutton.cpp
@@ -110,7 +110,10 @@ namespace gcn
 
 
         graphics->setFont(getFont());
-        graphics->setColor(getForegroundColor());
+        if (isEnabled())
+            graphics->setColor(getForegroundColor());
+        else
+            graphics->setColor(Color(128, 128, 128));
 
         if (isFocused())
         {
@@ -119,7 +122,7 @@ namespace gcn
 
         const int h = getHeight() + getHeight() / 2;
 
-        graphics->drawText(getCaption(), h - 2, 0);
+        graphics->drawText(getCaption(), h - 2, 0, Graphics::Left, isEnabled());
     }
 
     void RadioButton::drawBox(Graphics* graphics)

diff --git a/src/widgets/togglebutton.cpp b/src/widgets/togglebutton.cpp
@@ -115,7 +115,10 @@ namespace gcn
         graphics->drawLine(getWidth() - 1, 1, getWidth() - 1, getHeight() - 1);
         graphics->drawLine(1, getHeight() - 1, getWidth() - 1, getHeight() - 1);
 
-        graphics->setColor(getForegroundColor());
+        if (isEnabled())
+            graphics->setColor(getForegroundColor());
+        else
+            graphics->setColor(Color(128, 128, 128));
 
         int textX;
         const int textY = getHeight() / 2 - getFont()->getHeight() / 2;