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

Adapt to recent layout API changes. (Untested)

Browse Source 
git-svn-id: http://svn.haiku-os.org/webpositive/webkit/trunk@543 94f232f2-1747-11df-bad5-a5bfde151594
This commit is contained in:
stippi
2012-07-03 15:45:30 +02:00
committed by Alexandre Deckner
parent a4841f3a5d
commit a071b4d041
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/webpositive/BrowserWindow.cpp
+4
View File
@@ -431,6 +431,7 @@ BrowserWindow::BrowserWindow(BRect frame, SettingsMessage* appSettings,
.SetInsets(kInsetSpacing, kInsetSpacing, .SetInsets(kInsetSpacing, kInsetSpacing,
kInsetSpacing, kInsetSpacing) kInsetSpacing, kInsetSpacing)
) )
.TopView()
; ;
// Navigation group // Navigation group
@@ -445,6 +446,7 @@ BrowserWindow::BrowserWindow(BRect frame, SettingsMessage* appSettings,
kInsetSpacing) kInsetSpacing)
) )
.Add(new BSeparatorView(B_HORIZONTAL, B_PLAIN_BORDER)) .Add(new BSeparatorView(B_HORIZONTAL, B_PLAIN_BORDER))
.TopView()
; ;
// Status bar group // Status bar group
@@ -456,6 +458,7 @@ BrowserWindow::BrowserWindow(BRect frame, SettingsMessage* appSettings,
.AddStrut(12 - kElementSpacing) .AddStrut(12 - kElementSpacing)
.SetInsets(kInsetSpacing, 0, kInsetSpacing, 0) .SetInsets(kInsetSpacing, 0, kInsetSpacing, 0)
) )
.TopView()
; ;
BitmapButton* toggleFullscreenButton = new BitmapButton(kWindowIconBits, BitmapButton* toggleFullscreenButton = new BitmapButton(kWindowIconBits,
@@ -466,6 +469,7 @@ BrowserWindow::BrowserWindow(BRect frame, SettingsMessage* appSettings,
BView* menuBarGroup = BGroupLayoutBuilder(B_HORIZONTAL) BView* menuBarGroup = BGroupLayoutBuilder(B_HORIZONTAL)
.Add(mainMenu) .Add(mainMenu)
.Add(toggleFullscreenButton, 0.0f) .Add(toggleFullscreenButton, 0.0f)
.TopView()
; ;
// Layout // Layout
src/apps/webpositive/DownloadProgressView.cpp
+2
View File
@@ -266,12 +266,14 @@ DownloadProgressView::Init(BMessage* archive)
BView* verticalGroup = BGroupLayoutBuilder(B_VERTICAL, 3) BView* verticalGroup = BGroupLayoutBuilder(B_VERTICAL, 3)
.Add(fStatusBar) .Add(fStatusBar)
.Add(fInfoView) .Add(fInfoView)
.TopView()
; ;
verticalGroup->SetViewColor(ViewColor()); verticalGroup->SetViewColor(ViewColor());
layout->AddView(verticalGroup); layout->AddView(verticalGroup);
verticalGroup = BGroupLayoutBuilder(B_VERTICAL, 3) verticalGroup = BGroupLayoutBuilder(B_VERTICAL, 3)
.Add(fTopButton) .Add(fTopButton)
.Add(fBottomButton) .Add(fBottomButton)
.TopView()
; ;
verticalGroup->SetViewColor(ViewColor()); verticalGroup->SetViewColor(ViewColor());
layout->AddView(verticalGroup); layout->AddView(verticalGroup);
src/apps/webpositive/SettingsWindow.cpp
+6
View File
@@ -365,6 +365,8 @@ SettingsWindow::_CreateGeneralPage(float spacing)
.Add(BSpaceLayoutItem::CreateHorizontalStrut(spacing)) .Add(BSpaceLayoutItem::CreateHorizontalStrut(spacing))
.SetInsets(spacing, spacing, spacing, spacing) .SetInsets(spacing, spacing, spacing, spacing)
.TopView()
; ;
view->SetName(B_TRANSLATE("General")); view->SetName(B_TRANSLATE("General"));
return view; return view;
@@ -422,6 +424,8 @@ SettingsWindow::_CreateFontsPage(float spacing)
.Add(fFixedSizesMenu->CreateMenuBarLayoutItem(), 1, 13) .Add(fFixedSizesMenu->CreateMenuBarLayoutItem(), 1, 13)
.SetInsets(spacing, spacing, spacing, spacing) .SetInsets(spacing, spacing, spacing, spacing)
.View()
; ;
view->SetName(B_TRANSLATE("Fonts")); view->SetName(B_TRANSLATE("Fonts"));
return view; return view;
@@ -464,6 +468,8 @@ SettingsWindow::_CreateProxyPage(float spacing)
.Add(BSpaceLayoutItem::CreateGlue()) .Add(BSpaceLayoutItem::CreateGlue())
.SetInsets(spacing, spacing, spacing, spacing) .SetInsets(spacing, spacing, spacing, spacing)
.TopView()
; ;
view->SetName(B_TRANSLATE("Proxy server")); view->SetName(B_TRANSLATE("Proxy server"));
return view; return view;