Browse Source

Settings menu: Fix description clipping

Adjust description dimensions to make it fit exactly 3 lines for CJK.
Previously, the second line was clipped since we fixed the clipping.
pull/5545/head
Gleb Mazovetskiy 3 years ago
parent
commit
1e20a5721f
  1. 6
      Source/DiabloUI/settingsmenu.cpp

6
Source/DiabloUI/settingsmenu.cpp

@ -319,15 +319,17 @@ void UiSettingsMenu()
const Rectangle &uiRectangle = GetUIRectangle();
const int descriptionLineHeight = IsSmallFontTall() ? 20 : 18;
const int descriptionMarginTop = IsSmallFontTall() ? 10 : 16;
rectList = { uiRectangle.position + Displacement { 50, 204 }, Size { 540, 208 } };
rectDescription = { rectList.position + Displacement { -26, rectList.size.height + 16 }, Size { 590, 35 } };
rectDescription = { rectList.position + Displacement { -26, rectList.size.height + descriptionMarginTop }, Size { 590, 80 - descriptionMarginTop } };
optionDescription[0] = '\0';
string_view titleText = shownMenu == ShownMenuType::Settings ? _("Settings") : selectedOption->GetName();
vecDialog.push_back(std::make_unique<UiArtText>(titleText.data(), MakeSdlRect(uiRectangle.position.x, uiRectangle.position.y + 161, uiRectangle.size.width, 35), UiFlags::FontSize30 | UiFlags::ColorUiSilver | UiFlags::AlignCenter, 8));
vecDialog.push_back(std::make_unique<UiScrollbar>((*ArtScrollBarBackground)[0], (*ArtScrollBarThumb)[0], *ArtScrollBarArrow, MakeSdlRect(rectList.position.x + rectList.size.width + 5, rectList.position.y, 25, rectList.size.height)));
vecDialog.push_back(std::make_unique<UiArtText>(optionDescription, MakeSdlRect(rectDescription), UiFlags::FontSize12 | UiFlags::ColorUiSilverDark | UiFlags::AlignCenter, 1, IsSmallFontTall() ? 22 : 18));
vecDialog.push_back(std::make_unique<UiArtText>(optionDescription, MakeSdlRect(rectDescription), UiFlags::FontSize12 | UiFlags::ColorUiSilverDark | UiFlags::AlignCenter, 1, descriptionLineHeight));
size_t itemToSelect = 1;
std::optional<tl::function_ref<bool(SDL_Event &)>> eventHandler;

Loading…
Cancel
Save