From 59d0a8320073dcb0d098bbb4e8bccddc6bd94f00 Mon Sep 17 00:00:00 2001
From: Augustin Cavalier <waddlesplash@gmail.com>
Date: Wed, 28 Sep 2022 19:36:59 -0400
Subject: [PATCH] Remove "font size / 12" calculations from various places.

Use spacing values from BControlLook instead.
---
 src/apps/deskcalc/CalcApplication.cpp           | 9 +++------
 src/apps/powerstatus/ExtendedInfoWindow.cpp     | 5 ++---
 src/kits/tracker/OpenWithWindow.cpp             | 6 +++---
 src/preferences/backgrounds/BackgroundsView.cpp | 2 +-
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/apps/deskcalc/CalcApplication.cpp b/src/apps/deskcalc/CalcApplication.cpp
index 9fb468292c..197f3d9af1 100644
--- a/src/apps/deskcalc/CalcApplication.cpp
+++ b/src/apps/deskcalc/CalcApplication.cpp
@@ -17,6 +17,7 @@
 #include <string.h>
 
 #include <Catalog.h>
+#include <ControlLook.h>
 #include <Directory.h>
 #include <File.h>
 #include <FindDirectory.h>
@@ -34,9 +35,6 @@ static const char* kSettingsFileName = "DeskCalc_settings";
 const char* kAppName = B_TRANSLATE_SYSTEM_NAME("DeskCalc");
 const char* kSignature = "application/x-vnd.Haiku-DeskCalc";
 
-static const float kDefaultWindowWidth	= 220.0;
-static const float kDefaultWindowHeight	= 140.0;
-
 
 CalcApplication::CalcApplication()
 	:
@@ -57,9 +55,8 @@ CalcApplication::ReadyToRun()
 	BMessage settings;
 	_LoadSettings(settings);
 
-	float scaling = be_plain_font->Size() / 12.0f;
-	BRect frame(0, 0, (kDefaultWindowWidth * scaling) - 1,
-		(kDefaultWindowHeight * scaling) - 1);
+	BRect frame(0, 0, be_control_look->DefaultLabelSpacing() * 37.0f,
+		be_control_look->DefaultLabelSpacing() * 23.0f);
 	fCalcWindow = new CalcWindow(frame, &settings);
 
 	// reveal window
diff --git a/src/apps/powerstatus/ExtendedInfoWindow.cpp b/src/apps/powerstatus/ExtendedInfoWindow.cpp
index bd7090eab1..104943d44d 100644
--- a/src/apps/powerstatus/ExtendedInfoWindow.cpp
+++ b/src/apps/powerstatus/ExtendedInfoWindow.cpp
@@ -343,9 +343,8 @@ ExtendedInfoWindow::ExtendedInfoWindow(PowerStatusDriverInterface* interface)
 {
 	fDriverInterface->AcquireReference();
 
-	float scale = be_plain_font->Size() / 12.0f;
-	float tabHeight = 70.0f * scale;
-	BRect batteryRect(0, 0, 50 * scale, 50 * scale);
+	BRect batteryRect(BPoint(0, 0), be_control_look->ComposeIconSize(50));
+	float tabHeight = ceilf(batteryRect.Height() * 1.4f);
 	fBatteryTabView = new BatteryTabView("tabview");
 	fBatteryTabView->SetBorder(B_NO_BORDER);
 	fBatteryTabView->SetTabHeight(tabHeight);
diff --git a/src/kits/tracker/OpenWithWindow.cpp b/src/kits/tracker/OpenWithWindow.cpp
index fb9ecfb947..56e1c0fa45 100644
--- a/src/kits/tracker/OpenWithWindow.cpp
+++ b/src/kits/tracker/OpenWithWindow.cpp
@@ -47,6 +47,7 @@ All rights reserved.
 #include <Alert.h>
 #include <Button.h>
 #include <Catalog.h>
+#include <ControlLook.h>
 #include <Collator.h>
 #include <GroupView.h>
 #include <GridView.h>
@@ -72,7 +73,7 @@ const char* kDefaultOpenWithTemplate = "OpenWithSettings";
 // make SaveState/RestoreState save the current window setting for
 // other windows
 
-const float kMaxMenuWidth = 200;
+const float kMaxMenuWidthFactor = 33.0f;
 
 const int32 kDocumentKnobWidth = 16;
 const int32 kOpenAndMakeDefault = 'OpDf';
@@ -1238,7 +1239,6 @@ OpenWithMenu::DoneBuildingItemList()
 
 	BFont font;
 	GetFont(&font);
-	float scaling = font.Size() / 12.0f;
 
 	// fill out the item labels
 	for (int32 index = 0; index < count; index++) {
@@ -1273,7 +1273,7 @@ OpenWithMenu::DoneBuildingItemList()
 				label = path.Path();
 			}
 			font.TruncateString(&label, B_TRUNCATE_MIDDLE,
-				kMaxMenuWidth * scaling);
+				kMaxMenuWidthFactor * be_control_look->DefaultLabelSpacing());
 		}
 
 #if DEBUG
diff --git a/src/preferences/backgrounds/BackgroundsView.cpp b/src/preferences/backgrounds/BackgroundsView.cpp
index 9532bd7ad9..745381e5b5 100644
--- a/src/preferences/backgrounds/BackgroundsView.cpp
+++ b/src/preferences/backgrounds/BackgroundsView.cpp
@@ -1183,7 +1183,7 @@ Preview::Preview()
 	BControl("PreView", NULL, NULL, B_WILL_DRAW | B_SUBPIXEL_PRECISE)
 {
 	float aspectRatio = BScreen().Frame().Width() / BScreen().Frame().Height();
-	float previewWidth = 120.0f * std::max(1.0f, be_plain_font->Size() / 12.0f);
+	float previewWidth = be_control_look->DefaultLabelSpacing() * 20.0f;
 	float previewHeight = ceil(previewWidth / aspectRatio);
 
 	ResizeTo(previewWidth, previewHeight);