i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Style changes in Alert and StyledEdit Find Window

Browse Source
This commit is contained in:
John Scipione
2013-04-28 20:30:19 -04:00
parent 292b0d784c
commit 65e6ce6d53
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/stylededit/FindWindow.cpp
+1 -2
View File
@@ -25,6 +25,7 @@
#undef B_TRANSLATION_CONTEXT #undef B_TRANSLATION_CONTEXT
#define B_TRANSLATION_CONTEXT "FindandReplaceWindow" #define B_TRANSLATION_CONTEXT "FindandReplaceWindow"
FindWindow::FindWindow(BRect frame, BHandler* _handler, BString* searchString, FindWindow::FindWindow(BRect frame, BHandler* _handler, BString* searchString,
bool caseState, bool wrapState, bool backState) bool caseState, bool wrapState, bool backState)
: BWindow(frame, "FindWindow", B_MODAL_WINDOW, : BWindow(frame, "FindWindow", B_MODAL_WINDOW,
@@ -125,5 +126,3 @@ FindWindow::_SendMessage()
PostMessage(B_QUIT_REQUESTED); PostMessage(B_QUIT_REQUESTED);
} }
src/kits/interface/Alert.cpp
+6 -5
View File
@@ -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]); SetDefaultButton(fButtons[buttonCount - 1]);
defaultButtonFrameWidth += fButtons[buttonCount - 1]->Bounds().Width() / 2.0f; defaultButtonFrameWidth
+= fButtons[buttonCount - 1]->Bounds().Width() / 2.0f;
// Layout buttons // Layout buttons
@@ -525,9 +527,9 @@ BAlert::_InitObject(const char* text, const char* button0, const char* button1,
int32 iconLayoutScale = icon_layout_scale(); int32 iconLayoutScale = icon_layout_scale();
float totalWidth = kRightOffset + fButtons[buttonCount - 1]->Frame().right float totalWidth = kRightOffset + fButtons[buttonCount - 1]->Frame().right
- defaultButtonFrameWidth - fButtons[0]->Frame().left; - defaultButtonFrameWidth - fButtons[0]->Frame().left;
if (view->Bitmap()) { if (view->Bitmap())
totalWidth += (kIconStripeWidth + kWindowIconOffset) * iconLayoutScale; totalWidth += (kIconStripeWidth + kWindowIconOffset) * iconLayoutScale;
} else else
totalWidth += kWindowMinOffset; totalWidth += kWindowMinOffset;
float width = (spacing == B_OFFSET_SPACING float width = (spacing == B_OFFSET_SPACING
@@ -815,4 +817,3 @@ _BAlertFilter_::Filter(BMessage* msg, BHandler** target)
return B_DISPATCH_MESSAGE; return B_DISPATCH_MESSAGE;
} }