Extern/Beef
1
0
Fork 0
mirror of https://github.com/beefytech/Beef.git synced 2025-06-21 17:28:00 +02:00
Code Activity

Improved resizing when UI scale changes

Browse source
This commit is contained in:
Brian Fiete 2022-08-24 07:42:57 -07:00
parent 63c335959e
commit 2e9174be8d
2 changed files with 23 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
BeefLibs/Beefy2D/src/theme/dark/DarkIconButton.bf
View file

@ -50,9 +50,6 @@ namespace Beefy.theme.dark
get => mIcon; get => mIcon;
set set
{ {
if (mIcon == value)
return;
mIcon = value; mIcon = value;
if (mIcon != null) if (mIcon != null)
@ -80,7 +77,7 @@ namespace Beefy.theme.dark
float width = mPadding.Left + mIcon.mWidth + mPadding.Right; float width = mPadding.Left + mIcon.mWidth + mPadding.Right;
float height = mPadding.Top + mIcon.mHeight + mPadding.Bottom; float height = mPadding.Top + mIcon.mHeight + mPadding.Bottom;
Resize(0, 0, width, height); Resize(mX, mY, width, height);
} }
public override void Draw(Graphics g) public override void Draw(Graphics g)

36
IDE/src/ui/BookmarksPanel.bf
View file

@ -77,42 +77,29 @@ namespace IDE.ui
public this() public this()
{ {
mBtnCreateBookmarkFolder = new DarkIconButton(); mBtnCreateBookmarkFolder = new DarkIconButton();
mBtnCreateBookmarkFolder.Icon = DarkTheme.sDarkTheme.GetImage(.NewBookmarkFolder);
mBtnCreateBookmarkFolder.mOnMouseClick.Add(new (args) => gApp.mBookmarkManager.CreateFolder()); mBtnCreateBookmarkFolder.mOnMouseClick.Add(new (args) => gApp.mBookmarkManager.CreateFolder());
AddWidget(mBtnCreateBookmarkFolder); AddWidget(mBtnCreateBookmarkFolder);
float iconButtonWidth = mBtnCreateBookmarkFolder.Width;
mBtnPrevBookmark = new DarkIconButton(); mBtnPrevBookmark = new DarkIconButton();
mBtnPrevBookmark.Icon = DarkTheme.sDarkTheme.GetImage(.PrevBookmark);
mBtnPrevBookmark.mOnMouseClick.Add(new (args) => gApp.Cmd_PrevBookmark()); mBtnPrevBookmark.mOnMouseClick.Add(new (args) => gApp.Cmd_PrevBookmark());
mBtnPrevBookmark.X = GS!(1) + iconButtonWidth;
AddWidget(mBtnPrevBookmark); AddWidget(mBtnPrevBookmark);
mBtnNextBookmark = new DarkIconButton(); mBtnNextBookmark = new DarkIconButton();
mBtnNextBookmark.Icon = DarkTheme.sDarkTheme.GetImage(.NextBookmark);
mBtnNextBookmark.mOnMouseClick.Add(new (args) => gApp.Cmd_NextBookmark()); mBtnNextBookmark.mOnMouseClick.Add(new (args) => gApp.Cmd_NextBookmark());
mBtnNextBookmark.X = (GS!(1) + iconButtonWidth) * 2;
AddWidget(mBtnNextBookmark); AddWidget(mBtnNextBookmark);
mBtnPrevBookmarkInFolder = new DarkIconButton(); mBtnPrevBookmarkInFolder = new DarkIconButton();
mBtnPrevBookmarkInFolder.Icon = DarkTheme.sDarkTheme.GetImage(.PrevBookmarkInFolder);
mBtnPrevBookmarkInFolder.mOnMouseClick.Add(new (args) => gApp.Cmd_PrevBookmarkInFolder()); mBtnPrevBookmarkInFolder.mOnMouseClick.Add(new (args) => gApp.Cmd_PrevBookmarkInFolder());
mBtnPrevBookmarkInFolder.X = (GS!(1) + iconButtonWidth) * 3;
AddWidget(mBtnPrevBookmarkInFolder); AddWidget(mBtnPrevBookmarkInFolder);
mBtnNextBookmarkInFolder = new DarkIconButton(); mBtnNextBookmarkInFolder = new DarkIconButton();
mBtnNextBookmarkInFolder.Icon = DarkTheme.sDarkTheme.GetImage(.NextBookmarkInFolder);
mBtnNextBookmarkInFolder.mOnMouseClick.Add(new (args) => gApp.Cmd_NextBookmarkInFolder()); mBtnNextBookmarkInFolder.mOnMouseClick.Add(new (args) => gApp.Cmd_NextBookmarkInFolder());
mBtnNextBookmarkInFolder.X = (GS!(1) + iconButtonWidth) * 4;
AddWidget(mBtnNextBookmarkInFolder); AddWidget(mBtnNextBookmarkInFolder);
mBookmarksListView = new .(); mBookmarksListView = new .();
mBookmarksListView.mOnEditDone.Add(new => HandleEditDone); mBookmarksListView.mOnEditDone.Add(new => HandleEditDone);
mBookmarksListView.InitScrollbars(true, true); mBookmarksListView.InitScrollbars(true, true);
mBookmarksListView.mLabelX = GS!(6);
mBookmarksListView.mOnItemMouseClicked.Add(new => ListViewItemMouseClicked); mBookmarksListView.mOnItemMouseClicked.Add(new => ListViewItemMouseClicked);
mBookmarksListView.AddColumn(200, "Bookmark"); mBookmarksListView.AddColumn(200, "Bookmark");
@ -358,8 +345,29 @@ namespace IDE.ui
{ {
base.Resize(x, y, width, height); base.Resize(x, y, width, height);
float buttonHeight = mBtnCreateBookmarkFolder.mHeight; mBtnCreateBookmarkFolder.Icon = DarkTheme.sDarkTheme.GetImage(.NewBookmarkFolder);
mBtnCreateBookmarkFolder.Padding = .(GS!(4), GS!(4), GS!(4), GS!(4));
float iconButtonWidth = DarkTheme.sUnitSize + GS!(6);
mBtnPrevBookmark.X = GS!(1) + iconButtonWidth;
mBtnPrevBookmark.Icon = DarkTheme.sDarkTheme.GetImage(.PrevBookmark);
mBtnPrevBookmark.Padding = mBtnCreateBookmarkFolder.Padding;
mBtnNextBookmark.X = (GS!(1) + iconButtonWidth) * 2;
mBtnNextBookmark.Icon = DarkTheme.sDarkTheme.GetImage(.NextBookmark);
mBtnNextBookmark.Padding = mBtnCreateBookmarkFolder.Padding;
mBtnPrevBookmarkInFolder.X = (GS!(1) + iconButtonWidth) * 3;
mBtnPrevBookmarkInFolder.Icon = DarkTheme.sDarkTheme.GetImage(.PrevBookmarkInFolder);
mBtnPrevBookmarkInFolder.Padding = mBtnCreateBookmarkFolder.Padding;
mBtnNextBookmarkInFolder.X = (GS!(1) + iconButtonWidth) * 4;
mBtnNextBookmarkInFolder.Icon = DarkTheme.sDarkTheme.GetImage(.NextBookmarkInFolder);
mBtnNextBookmarkInFolder.Padding = mBtnCreateBookmarkFolder.Padding;
mBookmarksListView.mLabelX = GS!(6);
float buttonHeight = mBtnCreateBookmarkFolder.mHeight;
mBookmarksListView.Resize(0, buttonHeight, width, Math.Max(mHeight - buttonHeight, 0)); mBookmarksListView.Resize(0, buttonHeight, width, Math.Max(mHeight - buttonHeight, 0));
} }