diff --git a/src/widgets/checkbox.cpp b/src/widgets/checkbox.cpp index b27238c..d502246 100644 --- 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 index 8c3f0a5..ef690bf 100644 --- 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 index c256642..258e532 100644 --- 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.