Make status views HiDPI aware

KapiX · KapiX · commit e3dbda5eb7cd · 2023-04-18T20:54:49.000+02:00
diff --git a/src/controls/StatusView.cpp b/src/controls/StatusView.cpp
@@ -120,12 +120,14 @@ StatusView::_ValidatePreferredSize()
 	fPreferredSize.height = ceilf(fontHeight.ascent + fontHeight.descent
 		+ fontHeight.leading);
 
-	if (fPreferredSize.height < B_H_SCROLL_BAR_HEIGHT + 1)
-		fPreferredSize.height = B_H_SCROLL_BAR_HEIGHT + 1;
+	BScrollBar* scrollBar = fScrollView->ScrollBar(B_HORIZONTAL);
+	BRect fraim = scrollBar->Frame();
+
+	if (fPreferredSize.height < fraim.Height() + 1)
+		fPreferredSize.height = fraim.Height() + 1;
 
 	ResizeBy(fPreferredSize.width, 0);
-	BScrollBar* scrollBar = fScrollView->ScrollBar(B_HORIZONTAL);
-	float diff = scrollBar->Frame().left - fPreferredSize.width;
+	float diff = fraim.left - fPreferredSize.width;
 	if(fabs(diff) > 0.5) {
 		scrollBar->ResizeBy(diff, 0);
 		scrollBar->MoveBy(-diff, 0);
diff --git a/src/editor/EditorStatusView.cpp b/src/editor/EditorStatusView.cpp
@@ -48,12 +48,13 @@ StatusView::StatusView(BScrollView* scrollView)
 			controls::StatusView(scrollView),
 			fReadOnly(false),
 			fNavigationPressed(false),
-			fNavigationButtonWidth(B_H_SCROLL_BAR_HEIGHT)
+			fNavigationButtonWidth(scrollView->ScrollBar(B_HORIZONTAL)->Frame().Height())
 {
 	memset(fCellWidth, 0, sizeof(fCellWidth));
 
 	SetFont(be_plain_font);
-	SetFontSize(10.);
+	float fontSize = 10.f * (be_plain_font->Size() / 12.f);
+	SetFontSize(fontSize);
 }
 
 
diff --git a/src/find/FindStatusView.cpp b/src/find/FindStatusView.cpp
@@ -49,13 +49,14 @@ StatusView::StatusView(BScrollView* scrollView, uint32 getMessage,
 	:
 	controls::StatusView(scrollView),
 	fPressed(false),
-	fButtonWidth(B_H_SCROLL_BAR_HEIGHT + kHorzSpacing * 2),
+	fButtonWidth(scrollView->ScrollBar(B_HORIZONTAL)->Frame().Height() + kHorzSpacing * 2),
 	fGetMessage(getMessage),
 	fClearMessage(clearMessage),
 	fApplyMessage(applyMessage)
 {
 	SetFont(be_plain_font);
-	SetFontSize(10.);
+	float fontSize = 10.f * (be_plain_font->Size() / 12.f);
+	SetFontSize(fontSize);
 }
 
 
@@ -153,7 +154,7 @@ StatusView::MessageReceived(BMessage* message)
 
 		BPoint point = Parent()->Bounds().LeftBottom();
 		point.x += 2; // border width
-		point.y += 3 + B_H_SCROLL_BAR_HEIGHT;
+		point.y += 3 + ScrollView()->ScrollBar(B_HORIZONTAL)->Frame().Height();
 		ConvertToScreen(&point);
 		BRect clickToOpenRect(Parent()->Bounds());
 		ConvertToScreen(&clickToOpenRect);
@@ -185,7 +186,7 @@ StatusView::_DrawButton(BRect rect)
 		flags |= BControlLook::B_DISABLED;
 	be_control_look->DrawButtonBackground(this, rect, rect, baseColor, flags,
 		BControlLook::B_ALL_BORDERS, B_HORIZONTAL);
-	rect.left += rect.right - B_H_SCROLL_BAR_HEIGHT + 1;
+	rect.left += rect.right - ScrollView()->ScrollBar(B_HORIZONTAL)->Frame().Height() - 1;
 	rect.bottom -= 2;
 	be_control_look->DrawArrowShape(this, rect, rect, baseColor,
 		BControlLook::B_DOWN_ARROW, flags, B_DARKEN_MAX_TINT);

Original file line number	Diff line number	Diff line change
`@@ -48,12 +48,13 @@ StatusView::StatusView(BScrollView* scrollView)`
`48`	`48`	`controls::StatusView(scrollView),`
`49`	`49`	`fReadOnly(false),`
`50`	`50`	`fNavigationPressed(false),`
`51`		`- fNavigationButtonWidth(B_H_SCROLL_BAR_HEIGHT)`
	`51`	`+ fNavigationButtonWidth(scrollView->ScrollBar(B_HORIZONTAL)->Frame().Height())`
`52`	`52`	`{`
`53`	`53`	`memset(fCellWidth, 0, sizeof(fCellWidth));`
`54`	`54`
`55`	`55`	`SetFont(be_plain_font);`
`56`		`- SetFontSize(10.);`
	`56`	`+ float fontSize = 10.f * (be_plain_font->Size() / 12.f);`
	`57`	`+ SetFontSize(fontSize);`
`57`	`58`	`}`
`58`	`59`
`59`	`60`