From a1056d5fa3bdd65f80df8a4f0cb7a6fc6dfd37c4 Mon Sep 17 00:00:00 2001 From: Alexandre Deckner Date: Sun, 15 Feb 2009 12:58:09 +0000 Subject: [PATCH] * Key font size now also takes the window width into account. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29207 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/deskcalc/CalcView.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/apps/deskcalc/CalcView.cpp b/src/apps/deskcalc/CalcView.cpp index b6634595a8..ce90b4d3ae 100644 --- a/src/apps/deskcalc/CalcView.cpp +++ b/src/apps/deskcalc/CalcView.cpp @@ -39,6 +39,7 @@ const uint8 K_COLOR_OFFSET = 32; const float K_FONT_YPROP = 0.6f; +const float K_FONT_XPROP = 0.6f; const float K_DISPLAY_YPROP = 0.2f; enum { @@ -374,7 +375,13 @@ CalcView::Draw(BRect updateRect) SetHighColor(fButtonTextColor); SetLowColor(fBaseColor); SetDrawingMode(B_OP_COPY); - SetFontSize(((fHeight - sizeDisp) / (float)fRows) * K_FONT_YPROP); + + float fontSize = + min_c(((fHeight - sizeDisp) / (float)fRows) * K_FONT_YPROP, + (fWidth / (float)fColums) * K_FONT_XPROP); + + SetFontSize(fontSize); + float baselineOffset = ((fHeight - sizeDisp) / (float)fRows) * (1.0 - K_FONT_YPROP) * 0.5; CalcKey *key = fKeypad;