diff --git a/haiku-apps/lnlauncher/patches/lnlauncher-1.1.2.patchset b/haiku-apps/lnlauncher/patches/lnlauncher-1.1.2.patchset index 12ea7bc03..8a9a574d5 100644 --- a/haiku-apps/lnlauncher/patches/lnlauncher-1.1.2.patchset +++ b/haiku-apps/lnlauncher/patches/lnlauncher-1.1.2.patchset @@ -1,4 +1,4 @@ -From 10966120873fd1e31cab628aebe4dfe8689c71e3 Mon Sep 17 00:00:00 2001 +From b880310bab88ae5078c1d0112da245594a50bf06 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 10 Nov 2015 13:49:52 +0100 Subject: Save settings when they change instead of at app exit. @@ -126,7 +126,7 @@ index 38622e3..34f6da5 100644 2.2.2 -From c8eeace21e37cf80782c5bb43a978e40bfcce511 Mon Sep 17 00:00:00 2001 +From 76a5c67c5434cbca9bfb69ff45f9f18979f346f3 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 10 Nov 2015 14:08:30 +0100 Subject: Remove rescue, add autostart @@ -655,3 +655,60 @@ index 34f6da5..1126ce8 100644 -- 2.2.2 + +From 8498d6d5be16814b482c9122873a56f6b2aec3c3 Mon Sep 17 00:00:00 2001 +From: Adrien Destugues +Date: Tue, 10 Nov 2015 20:26:48 +0100 +Subject: Fix background of GetStringWindow + +* This was not done right, overlapping views don't work well. + +diff --git a/source/GetStringWindow.cpp b/source/GetStringWindow.cpp +index 7ed9288..4ad9e4b 100644 +--- a/source/GetStringWindow.cpp ++++ b/source/GetStringWindow.cpp +@@ -48,9 +48,13 @@ GetStringWindow::CommonInit( const char * label, const char * text ) + float y_middle = Bounds().Height() / 2; + float x_middle = Bounds().Width() / 2; + ++ BView *view = new BView(Frame(), "background", B_FOLLOW_ALL, B_WILL_DRAW); ++ AddChild(view); ++ view->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); ++ + BTextControl * control = new BTextControl( + BRect(15, 5, 280, 10), "control", label, text, new BMessage); +- AddChild( control ); ++ view->AddChild(control); + + BFont font; + control->GetFont( &font ); +@@ -62,23 +66,16 @@ GetStringWindow::CommonInit( const char * label, const char * text ) + BButton * cancel = new BButton( + button_rect, "", B_TRANSLATE(kCancel), + new BMessage('Canc')); +- AddChild( cancel ); ++ view->AddChild(cancel); + cancel->MoveBy(0, y_middle + 5); + + BButton * ok = new BButton( + button_rect, "", B_TRANSLATE(kOk), + new BMessage('Ok ')); +- AddChild( ok ); ++ view->AddChild(ok); + ok->MoveBy( x_middle, y_middle + 5 ); + +- BScreen screen( this ); +- +- BRect frame( screen.Frame() ); +- MoveTo( ( frame.Width() - Frame().Width())/2,(frame.Height()-Frame().Height())/2 ); +- +- BView *view = new BView(BRect(0,0,300,65),"background", B_FOLLOW_ALL, B_WILL_DRAW); +- AddChild(view); +- // view->SetViewColor(ui_color(B_PANEL_BACKGROUND_COLOR)); ++ CenterOnScreen(); + } + + +-- +2.2.2 +