Merge remote-tracking branch 'upstream/master' into original

midwan · Nov 10, 2024 · f685b62 · f685b62
2 parents 265fde6 + ae0a35c
commit f685b62
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/src/widgets/checkbox.cpp b/src/widgets/checkbox.cpp
@@ -192,7 +192,8 @@ namespace gcn
     {
         const int height = getFont()->getHeight();
 
-        setHeight(height);
+        // Add two pixels to avoid font clipping
+        setHeight(height + 2);
         setWidth(getFont()->getWidth(mCaption) + height + height / 2);
     }
 

diff --git a/src/widgets/dropdown.cpp b/src/widgets/dropdown.cpp
@@ -414,11 +414,11 @@ namespace gcn
             else
             {
                 setHeight(listBoxHeight + h2 + 2);
-                mScrollArea->setHeight(listBoxHeight);
+                mScrollArea->setHeight(listBoxHeight + mScrollArea->getScrollbarWidth());
             }
         }
 
-        mScrollArea->setWidth(getWidth());
+        mScrollArea->setWidth(getWidth() + mScrollArea->getScrollbarWidth());
         // Resize the ListBox to exactly fit the ScrollArea.
         mListBox->setWidth(mScrollArea->getChildrenArea().width);
         mScrollArea->setPosition(0, 0);

diff --git a/src/widgets/listbox.cpp b/src/widgets/listbox.cpp
@@ -126,7 +126,7 @@ namespace gcn
             startRow = 0;
         }
 
-        const auto inactive_color = Color(170, 170, 170);
+        const auto inactive_color = getSelectionColor() - 0x303030;
 
         // The y coordinate where we start to draw the text is
         // simply the y coordinate multiplied with the font height.