From 0da447f91719363bc3b56711eb872da8afb68f76 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 5 Apr 2011 22:11:57 +0000 Subject: [PATCH] * There is no good reason to use a tiny font size here that doesn't even render as well with our default font. * Minor cleanup. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@41186 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/apps/deskbar/CalendarMenuWindow.cpp | 27 ++++++++++--------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/src/apps/deskbar/CalendarMenuWindow.cpp b/src/apps/deskbar/CalendarMenuWindow.cpp index 86ca7118e8..9b77e805ec 100644 --- a/src/apps/deskbar/CalendarMenuWindow.cpp +++ b/src/apps/deskbar/CalendarMenuWindow.cpp @@ -24,7 +24,16 @@ using BPrivate::B_WEEK_START_SUNDAY; using BPrivate::B_WEEK_START_MONDAY; -// #pragma mark -- FlatButton +enum { + kInvokationMessage, + kMonthDownMessage, + kMonthUpMessage, + kYearDownMessage, + kYearUpMessage +}; + + +// #pragma mark - FlatButton class FlatButton : public BButton { @@ -66,16 +75,7 @@ FlatButton::Draw(BRect updateRect) } -// #pragma mark -- CalendarMenuWindow - - -enum { - kInvokationMessage, - kMonthDownMessage, - kMonthUpMessage, - kYearDownMessage, - kYearUpMessage -}; +// #pragma mark - CalendarMenuWindow CalendarMenuWindow::CalendarMenuWindow(BPoint where) @@ -95,15 +95,11 @@ CalendarMenuWindow::CalendarMenuWindow(BPoint where) AddShortcut('W', B_COMMAND_KEY, new BMessage(B_QUIT_REQUESTED)); fYearLabel = new BStringView("year", ""); - fYearLabel->SetFontSize(10.0); - fMonthLabel = new BStringView("month", ""); - fMonthLabel->SetFontSize(10.0); fCalendarView = new BCalendarView(Bounds(), "calendar", startOfWeek, B_FOLLOW_ALL); fCalendarView->SetInvocationMessage(new BMessage(kInvokationMessage)); - fCalendarView->SetFontSize(10.0); BGroupLayout* layout = new BGroupLayout(B_HORIZONTAL); SetLayout(layout); @@ -254,7 +250,6 @@ CalendarMenuWindow::_SetupButton(const char* label, uint32 what, float height) { FlatButton* button = new FlatButton(label, what); button->SetExplicitMinSize(BSize(height, height)); - button->SetFontSize(be_plain_font->Size() * 0.8); return button; }