From 65e6ce6d53a03130be27c0d3d9650fe42a3bfc01 Mon Sep 17 00:00:00 2001 From: John Scipione Date: Sun, 28 Apr 2013 20:08:46 -0400 Subject: [PATCH] Style changes in Alert and StyledEdit Find Window --- src/apps/stylededit/FindWindow.cpp | 3 +-- src/kits/interface/Alert.cpp | 11 ++++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/apps/stylededit/FindWindow.cpp b/src/apps/stylededit/FindWindow.cpp index 2f4eb61fd7..20187d7b3a 100644 --- a/src/apps/stylededit/FindWindow.cpp +++ b/src/apps/stylededit/FindWindow.cpp @@ -25,6 +25,7 @@ #undef B_TRANSLATION_CONTEXT #define B_TRANSLATION_CONTEXT "FindandReplaceWindow" + FindWindow::FindWindow(BRect frame, BHandler* _handler, BString* searchString, bool caseState, bool wrapState, bool backState) : BWindow(frame, "FindWindow", B_MODAL_WINDOW, @@ -125,5 +126,3 @@ FindWindow::_SendMessage() PostMessage(B_QUIT_REQUESTED); } - - diff --git a/src/kits/interface/Alert.cpp b/src/kits/interface/Alert.cpp index ed53bb17d9..fcd39f9c69 100644 --- a/src/kits/interface/Alert.cpp +++ b/src/kits/interface/Alert.cpp @@ -499,9 +499,11 @@ BAlert::_InitObject(const char* text, const char* button0, const char* button1, } } - float defaultButtonFrameWidth = -fButtons[buttonCount - 1]->Bounds().Width() / 2.0f; + float defaultButtonFrameWidth + = -fButtons[buttonCount - 1]->Bounds().Width() / 2.0f; SetDefaultButton(fButtons[buttonCount - 1]); - defaultButtonFrameWidth += fButtons[buttonCount - 1]->Bounds().Width() / 2.0f; + defaultButtonFrameWidth + += fButtons[buttonCount - 1]->Bounds().Width() / 2.0f; // Layout buttons @@ -525,9 +527,9 @@ BAlert::_InitObject(const char* text, const char* button0, const char* button1, int32 iconLayoutScale = icon_layout_scale(); float totalWidth = kRightOffset + fButtons[buttonCount - 1]->Frame().right - defaultButtonFrameWidth - fButtons[0]->Frame().left; - if (view->Bitmap()) { + if (view->Bitmap()) totalWidth += (kIconStripeWidth + kWindowIconOffset) * iconLayoutScale; - } else + else totalWidth += kWindowMinOffset; float width = (spacing == B_OFFSET_SPACING @@ -815,4 +817,3 @@ _BAlertFilter_::Filter(BMessage* msg, BHandler** target) return B_DISPATCH_MESSAGE; } -