hrev52405 adds 1 changeset to branch 'master'
old head: f0d35c6dbf28a35de86d9d33cbcd7a24cdebfe9e
new head: f15270537aa959953203f8aef41bacea47f30f2e
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=f15270537aa9+%5Ef0d35c6dbf28
----------------------------------------------------------------------------
f15270537aa9: WebPositive: fixes the layout of fonts tab
* Fixes #13165
Change-Id: Id056495e09dea751b172391a5abfdd77857df9cb
Reviewed-on: https://review.haiku-os.org/619
Reviewed-by: Adrien Destugues <pulkomandy@xxxxxxxxxxxxx>
[ Janus <janus2@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev52405
Commit: f15270537aa959953203f8aef41bacea47f30f2e
URL: https://git.haiku-os.org/haiku/commit/?id=f15270537aa9
Author: Janus <janus2@xxxxxxxxx>
Date: Thu Oct 11 12:37:42 2018 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Wed Oct 17 19:27:40 2018 UTC
Ticket: https://dev.haiku-os.org/ticket/13165
----------------------------------------------------------------------------
3 files changed, 36 insertions(+), 34 deletions(-)
src/apps/webpositive/SettingsWindow.cpp | 56 +++++++++-----------
.../webpositive/support/FontSelectionView.cpp | 13 +++--
src/apps/webpositive/support/FontSelectionView.h | 1 +
----------------------------------------------------------------------------
diff --git a/src/apps/webpositive/SettingsWindow.cpp
b/src/apps/webpositive/SettingsWindow.cpp
index a6ab410c79..24b3563a32 100644
--- a/src/apps/webpositive/SettingsWindow.cpp
+++ b/src/apps/webpositive/SettingsWindow.cpp
@@ -349,19 +349,19 @@ SettingsWindow::_CreateGeneralPage(float spacing)
.Add(fNewTabBehaviorMenu->CreateLabelLayoutItem(), 0, 4)
.Add(fNewTabBehaviorMenu->CreateMenuBarLayoutItem(), 1,
4)
)
- .Add(BSpaceLayoutItem::CreateHorizontalStrut(spacing))
+ .Add(BSpaceLayoutItem::CreateVerticalStrut(spacing))
.Add(new BSeparatorView(B_HORIZONTAL, B_PLAIN_BORDER))
- .Add(BSpaceLayoutItem::CreateHorizontalStrut(spacing))
+ .Add(BSpaceLayoutItem::CreateVerticalStrut(spacing))
.Add(fShowTabsIfOnlyOnePage)
.Add(fAutoHideInterfaceInFullscreenMode)
.Add(fAutoHidePointer)
.Add(fShowHomeButton)
- .Add(BSpaceLayoutItem::CreateHorizontalStrut(spacing))
- .Add(fDaysInHistory)
+ .Add(BSpaceLayoutItem::CreateVerticalStrut(spacing))
+ .Add(fDaysInHistory)
+ .AddGlue()
.SetInsets(B_USE_WINDOW_SPACING, B_USE_WINDOW_SPACING,
B_USE_WINDOW_SPACING, B_USE_DEFAULT_SPACING)
-
.TopView()
;
view->SetName(B_TRANSLATE("General"));
@@ -385,45 +385,39 @@ SettingsWindow::_CreateFontsPage(float spacing)
fStandardSizesMenu = new BMenuField("standard font size",
B_TRANSLATE("Default standard font size:"), new
BPopUpMenu("sizes"),
B_WILL_DRAW);
+ fStandardSizesMenu->SetAlignment(B_ALIGN_RIGHT);
+
_BuildSizesMenu(fStandardSizesMenu->Menu(),
MSG_STANDARD_FONT_SIZE_SELECTED);
fFixedSizesMenu = new BMenuField("fixed font size",
B_TRANSLATE("Default fixed font size:"), new
BPopUpMenu("sizes"),
B_WILL_DRAW);
+ fFixedSizesMenu->SetAlignment(B_ALIGN_RIGHT);
+
_BuildSizesMenu(fFixedSizesMenu->Menu(), MSG_FIXED_FONT_SIZE_SELECTED);
BView* view = BGridLayoutBuilder(spacing / 2, spacing / 2)
.Add(fStandardFontView->CreateFontsLabelLayoutItem(), 0, 0)
.Add(fStandardFontView->CreateFontsMenuBarLayoutItem(), 1, 0)
- .Add(fStandardFontView->PreviewBox(), 0, 1, 2)
- .Add(BSpaceLayoutItem::CreateHorizontalStrut(spacing), 0, 2, 2)
-
- .Add(fSerifFontView->CreateFontsLabelLayoutItem(), 0, 3)
- .Add(fSerifFontView->CreateFontsMenuBarLayoutItem(), 1, 3)
- .Add(fSerifFontView->PreviewBox(), 0, 4, 2)
- .Add(BSpaceLayoutItem::CreateHorizontalStrut(spacing), 0, 5, 2)
-
- .Add(fSansSerifFontView->CreateFontsLabelLayoutItem(), 0, 6)
- .Add(fSansSerifFontView->CreateFontsMenuBarLayoutItem(), 1, 6)
- .Add(fSansSerifFontView->PreviewBox(), 0, 7, 2)
- .Add(BSpaceLayoutItem::CreateHorizontalStrut(spacing), 0, 8, 2)
-
- .Add(fFixedFontView->CreateFontsLabelLayoutItem(), 0, 9)
- .Add(fFixedFontView->CreateFontsMenuBarLayoutItem(), 1, 9)
- .Add(fFixedFontView->PreviewBox(), 0, 10, 2)
- .Add(BSpaceLayoutItem::CreateHorizontalStrut(spacing), 0, 11, 2)
-
- .Add(fStandardSizesMenu->CreateLabelLayoutItem(), 0, 12)
- .Add(fStandardSizesMenu->CreateMenuBarLayoutItem(), 1, 12)
- .Add(fFixedSizesMenu->CreateLabelLayoutItem(), 0, 13)
- .Add(fFixedSizesMenu->CreateMenuBarLayoutItem(), 1, 13)
-
+ .Add(fStandardSizesMenu->CreateLabelLayoutItem(), 2, 0)
+ .Add(fStandardSizesMenu->CreateMenuBarLayoutItem(), 3, 0)
+ .Add(fStandardFontView->PreviewBox(), 1, 1, 3)
+ .Add(fSerifFontView->CreateFontsLabelLayoutItem(), 0, 2)
+ .Add(fSerifFontView->CreateFontsMenuBarLayoutItem(), 1, 2)
+ .Add(fSerifFontView->PreviewBox(), 1, 3, 3)
+ .Add(fSansSerifFontView->CreateFontsLabelLayoutItem(), 0, 4)
+ .Add(fSansSerifFontView->CreateFontsMenuBarLayoutItem(), 1, 4)
+ .Add(fSansSerifFontView->PreviewBox(), 1, 5, 3)
+ .Add(BSpaceLayoutItem::CreateVerticalStrut(spacing / 2), 0, 6,
2)
+ .Add(fFixedFontView->CreateFontsLabelLayoutItem(), 0, 7)
+ .Add(fFixedFontView->CreateFontsMenuBarLayoutItem(), 1, 7)
+ .Add(fFixedSizesMenu->CreateLabelLayoutItem(), 2, 7)
+ .Add(fFixedSizesMenu->CreateMenuBarLayoutItem(), 3, 7)
+ .Add(fFixedFontView->PreviewBox(), 1, 8, 3)
.SetInsets(B_USE_WINDOW_SPACING, B_USE_WINDOW_SPACING,
B_USE_WINDOW_SPACING, B_USE_DEFAULT_SPACING)
-
- .View()
- ;
+ .View();
view->SetName(B_TRANSLATE("Fonts"));
return view;
diff --git a/src/apps/webpositive/support/FontSelectionView.cpp
b/src/apps/webpositive/support/FontSelectionView.cpp
index 4d1c9ed2f5..c228f300df 100644
--- a/src/apps/webpositive/support/FontSelectionView.cpp
+++ b/src/apps/webpositive/support/FontSelectionView.cpp
@@ -60,7 +60,7 @@ FontSelectionView::FontSelectionView(const char* name, const
char* label,
// font menu
fFontsMenuField = new BMenuField("fonts", label, fFontsMenu,
B_WILL_DRAW);
- fFontsMenuField->SetFont(be_bold_font);
+ fFontsMenuField->SetAlignment(B_ALIGN_RIGHT);
// styles menu, if desired
if (separateStyles) {
@@ -86,7 +86,14 @@ FontSelectionView::FontSelectionView(const char* name, const
char* label,
fPreviewText->SetExplicitMaxSize(BSize(B_SIZE_UNLIMITED,
B_SIZE_UNLIMITED));
fPreviewText->SetHighUIColor(B_PANEL_BACKGROUND_COLOR, 1.65);
- fPreviewText->SetAlignment(B_ALIGN_RIGHT);
+
+ fPreviewBox = new BBox("preview box", B_WILL_DRAW | B_FRAME_EVENTS);
+ fPreviewBox->AddChild(BGroupLayoutBuilder(B_VERTICAL,
B_USE_HALF_ITEM_SPACING)
+ .Add(fPreviewText)
+ .SetInsets(B_USE_HALF_ITEM_SPACING, B_USE_HALF_ITEM_SPACING,
+ B_USE_HALF_ITEM_SPACING, B_USE_HALF_ITEM_SPACING)
+ .TopView()
+ );
_UpdateFontPreview();
}
@@ -399,7 +406,7 @@ FontSelectionView::CreateStylesMenuBarLayoutItem()
BView*
FontSelectionView::PreviewBox() const
{
- return fPreviewText;
+ return fPreviewBox;
}
diff --git a/src/apps/webpositive/support/FontSelectionView.h
b/src/apps/webpositive/support/FontSelectionView.h
index 8ee630b448..a132984503 100644
--- a/src/apps/webpositive/support/FontSelectionView.h
+++ b/src/apps/webpositive/support/FontSelectionView.h
@@ -80,6 +80,7 @@ protected:
BPopUpMenu* fStylesMenu;
BPopUpMenu* fSizesMenu;
BStringView* fPreviewText;
+ BBox* fPreviewBox;
BFont fSavedFont;
BFont fCurrentFont;
