hrev54242 adds 1 changeset to branch 'master'
old head: afc74b61fe070cb58906d8a20a6ab42c9b019add
new head: 95b2739da8bad2f20de23c2e2e24e35ce3b6bda4
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=95b2739da8ba+%5Eafc74b61fe07
----------------------------------------------------------------------------
95b2739da8ba: FirstBootPrompt: adjust window size to font size
At 12pt, we try to fit a 640x480 display. But at larger font sizes we
have to allow some more space.
Fixes #16066.
[ Adrien Destugues <pulkomandy@xxxxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev54242
Commit: 95b2739da8bad2f20de23c2e2e24e35ce3b6bda4
URL: https://git.haiku-os.org/haiku/commit/?id=95b2739da8ba
Author: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
Date: Fri May 22 08:16:15 2020 UTC
Ticket: https://dev.haiku-os.org/ticket/16066
----------------------------------------------------------------------------
1 file changed, 2 insertions(+), 2 deletions(-)
src/apps/firstbootprompt/BootPromptWindow.cpp | 4 ++--
----------------------------------------------------------------------------
diff --git a/src/apps/firstbootprompt/BootPromptWindow.cpp
b/src/apps/firstbootprompt/BootPromptWindow.cpp
index d8d36bef45..60e1ca14b2 100644
--- a/src/apps/firstbootprompt/BootPromptWindow.cpp
+++ b/src/apps/firstbootprompt/BootPromptWindow.cpp
@@ -68,7 +68,7 @@ static const char* kLanguageKeymapMappings[] = {
// Cyrillic keymaps are not usable alone, as latin alphabet is required
to
// use Terminal. So we stay in US international until the user has a
chance
- // to set up KeymapSwitcher. TODO enable KeymapSwitcher automatically.
+ // to set up KeymapSwitcher.
"Belarusian", "US-International",
"Russian", "US-International",
"Ukrainian", "US-International",
@@ -202,7 +202,7 @@ BootPromptWindow::BootPromptWindow()
fLanguagesListView, B_WILL_DRAW, false, true);
// Carefully designed to not exceed the 640x480 resolution with a 12pt
font.
- float width = 640 - (labelWidth + 96);
+ float width = 640 * be_plain_font->Size() / 12 - (labelWidth + 64);
float height = be_plain_font->Size() * 23;
fInfoTextView->SetExplicitMinSize(BSize(width, height));
fInfoTextView->SetExplicitMaxSize(BSize(width, B_SIZE_UNSET));
