From a071b4d0417fbb6971696d8bd5c54b1c5738c9ab Mon Sep 17 00:00:00 2001 From: stippi Date: Wed, 18 Aug 2010 14:53:43 +0000 Subject: [PATCH] Adapt to recent layout API changes. (Untested) git-svn-id: http://svn.haiku-os.org/webpositive/webkit/trunk@543 94f232f2-1747-11df-bad5-a5bfde151594 --- src/apps/webpositive/BrowserWindow.cpp | 4 ++++ src/apps/webpositive/DownloadProgressView.cpp | 2 ++ src/apps/webpositive/SettingsWindow.cpp | 6 ++++++ 3 files changed, 12 insertions(+) diff --git a/src/apps/webpositive/BrowserWindow.cpp b/src/apps/webpositive/BrowserWindow.cpp index 1bb698234a..e74bcabc3b 100644 --- a/src/apps/webpositive/BrowserWindow.cpp +++ b/src/apps/webpositive/BrowserWindow.cpp @@ -431,6 +431,7 @@ BrowserWindow::BrowserWindow(BRect frame, SettingsMessage* appSettings, .SetInsets(kInsetSpacing, kInsetSpacing, kInsetSpacing, kInsetSpacing) ) + .TopView() ; // Navigation group @@ -445,6 +446,7 @@ BrowserWindow::BrowserWindow(BRect frame, SettingsMessage* appSettings, kInsetSpacing) ) .Add(new BSeparatorView(B_HORIZONTAL, B_PLAIN_BORDER)) + .TopView() ; // Status bar group @@ -456,6 +458,7 @@ BrowserWindow::BrowserWindow(BRect frame, SettingsMessage* appSettings, .AddStrut(12 - kElementSpacing) .SetInsets(kInsetSpacing, 0, kInsetSpacing, 0) ) + .TopView() ; BitmapButton* toggleFullscreenButton = new BitmapButton(kWindowIconBits, @@ -466,6 +469,7 @@ BrowserWindow::BrowserWindow(BRect frame, SettingsMessage* appSettings, BView* menuBarGroup = BGroupLayoutBuilder(B_HORIZONTAL) .Add(mainMenu) .Add(toggleFullscreenButton, 0.0f) + .TopView() ; // Layout diff --git a/src/apps/webpositive/DownloadProgressView.cpp b/src/apps/webpositive/DownloadProgressView.cpp index f819651f72..7048e1d56a 100644 --- a/src/apps/webpositive/DownloadProgressView.cpp +++ b/src/apps/webpositive/DownloadProgressView.cpp @@ -266,12 +266,14 @@ DownloadProgressView::Init(BMessage* archive) BView* verticalGroup = BGroupLayoutBuilder(B_VERTICAL, 3) .Add(fStatusBar) .Add(fInfoView) + .TopView() ; verticalGroup->SetViewColor(ViewColor()); layout->AddView(verticalGroup); verticalGroup = BGroupLayoutBuilder(B_VERTICAL, 3) .Add(fTopButton) .Add(fBottomButton) + .TopView() ; verticalGroup->SetViewColor(ViewColor()); layout->AddView(verticalGroup); diff --git a/src/apps/webpositive/SettingsWindow.cpp b/src/apps/webpositive/SettingsWindow.cpp index f0be0810c4..743b03570a 100644 --- a/src/apps/webpositive/SettingsWindow.cpp +++ b/src/apps/webpositive/SettingsWindow.cpp @@ -365,6 +365,8 @@ SettingsWindow::_CreateGeneralPage(float spacing) .Add(BSpaceLayoutItem::CreateHorizontalStrut(spacing)) .SetInsets(spacing, spacing, spacing, spacing) + + .TopView() ; view->SetName(B_TRANSLATE("General")); return view; @@ -422,6 +424,8 @@ SettingsWindow::_CreateFontsPage(float spacing) .Add(fFixedSizesMenu->CreateMenuBarLayoutItem(), 1, 13) .SetInsets(spacing, spacing, spacing, spacing) + + .View() ; view->SetName(B_TRANSLATE("Fonts")); return view; @@ -464,6 +468,8 @@ SettingsWindow::_CreateProxyPage(float spacing) .Add(BSpaceLayoutItem::CreateGlue()) .SetInsets(spacing, spacing, spacing, spacing) + + .TopView() ; view->SetName(B_TRANSLATE("Proxy server")); return view;