Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tracker: Line TitleView up with scroll bar arrow

Browse Source 
Make TitleView a few pixels shorter at the default font size so that
it lines up with the scroll bar arrow to its immediate right.

Note the font size used in the title view before and still is 9px
(12px * 3/4)

Make this the minimum TitleView height even for smaller font sizes
so that the title view never is shorter than the height of a
scrollbar button.  Make the minimum font size for TitleView 8px
because 6px (8px * 3/4) was just too small to read.

As font size is made larger it will increase the height of the
titlebar to accomodate the increased font size and consequently no
longer line up with the scrollbar arrow.

The code to scale the bar height via the font height was taken from
BColumnListView. The code to position the title in the middle of the
title bar was also taken from BColumnListView.

Some included style fixes:
* Rename height to fontHeight
* Rename loc to titleLocation
* 80 column limit
This commit is contained in:
John Scipione 2017-11-17 17:07:52 -08:00
parent 24c9b9df7a
commit 5c6208cc0c
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/kits/tracker/TitleView.cpp
View File

@ -45,6 +45,8 @@ All rights reserved.
#include <PopUpMenu.h> #include <PopUpMenu.h>
#include <Window.h> #include <Window.h>
#include <algorithm>
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
@ -56,6 +58,12 @@ All rights reserved.
#define APP_SERVER_CLEARS_BACKGROUND 1 #define APP_SERVER_CLEARS_BACKGROUND 1
static const float kMinFontSize = 8.0f;
static const float kMinTitleHeight = 13.0f;
static const float kTitleSpacing = 1.4f;
static void static void
_DrawLine(BPoseView* view, BPoint from, BPoint to) _DrawLine(BPoseView* view, BPoint from, BPoint to)
{ {
@ -108,13 +116,15 @@ BTitleView::BTitleView(BPoseView* view)
SetViewColor(B_TRANSPARENT_COLOR); SetViewColor(B_TRANSPARENT_COLOR);
#endif #endif
float fontSize = std::max(kMinFontSize,
floorf(be_plain_font->Size() * 0.75f));
BFont font(be_plain_font); BFont font(be_plain_font);
font.SetSize(floorf(be_plain_font->Size() * 0.75f)); font.SetSize(fontSize);
SetFont(&font); SetFont(&font);
font_height height; fPreferredHeight = std::max(kMinTitleHeight,
GetFontHeight(&height); ceilf(fontSize * kTitleSpacing));
fPreferredHeight = ceilf(height.ascent + height.descent) + 2;
Reset(); Reset();
} }
@ -467,9 +477,13 @@ BColumnTitle::Draw(BView* view, bool pressed)
{ {
BRect bounds(Bounds()); BRect bounds(Bounds());
font_height height; font_height fontHeight;
view->GetFontHeight(&height); view->GetFontHeight(&fontHeight);
BPoint loc(0, bounds.top + ceilf(height.ascent) + 2);
float baseline = floor(bounds.top + fontHeight.ascent
+ (bounds.Height() + 1 - (fontHeight.ascent + fontHeight.descent)) / 2);
BPoint titleLocation(0, baseline);
rgb_color baseColor = ui_color(B_PANEL_BACKGROUND_COLOR); rgb_color baseColor = ui_color(B_PANEL_BACKGROUND_COLOR);
if (pressed) { if (pressed) {
@ -490,22 +504,23 @@ BColumnTitle::Draw(BView* view, bool pressed)
switch (fColumn->Alignment()) { switch (fColumn->Alignment()) {
case B_ALIGN_LEFT: case B_ALIGN_LEFT:
default: default:
loc.x = bounds.left + 1 + kTitleColumnLeftExtraMargin; titleLocation.x = bounds.left + 1 + kTitleColumnLeftExtraMargin;
break; break;
case B_ALIGN_CENTER: case B_ALIGN_CENTER:
loc.x = bounds.left + (bounds.Width() / 2) - (resultingWidth / 2); titleLocation.x = bounds.left + (bounds.Width() / 2)
- (resultingWidth / 2);
break; break;
case B_ALIGN_RIGHT: case B_ALIGN_RIGHT:
loc.x = bounds.right - resultingWidth titleLocation.x = bounds.right - resultingWidth
- kTitleColumnRightExtraMargin; - kTitleColumnRightExtraMargin;
break; break;
} }
view->SetHighUIColor(B_PANEL_TEXT_COLOR, pressed ? B_DARKEN_1_TINT : 1.0f); view->SetHighUIColor(B_PANEL_TEXT_COLOR, pressed ? B_DARKEN_1_TINT : 1.0f);
view->SetLowColor(baseColor); view->SetLowColor(baseColor);
view->DrawString(titleString.String(), loc); view->DrawString(titleString.String(), titleLocation);
// show sort columns // show sort columns
bool secondary bool secondary
@ -513,7 +528,8 @@ BColumnTitle::Draw(BView* view, bool pressed)
if (secondary if (secondary
|| (fColumn->AttrHash() == fParent->PoseView()->PrimarySort())) { || (fColumn->AttrHash() == fParent->PoseView()->PrimarySort())) {
BPoint center(loc.x - 6, roundf((bounds.top + bounds.bottom) / 2.0)); BPoint center(titleLocation.x - 6,
roundf((bounds.top + bounds.bottom) / 2.0));
BPoint triangle[3]; BPoint triangle[3];
if (fParent->PoseView()->ReverseSort()) { if (fParent->PoseView()->ReverseSort()) {
triangle[0] = center + BPoint(-3.5, 1.5); triangle[0] = center + BPoint(-3.5, 1.5);