From 752b93d3b73d74d90084089f6a4c8d4b7046af7b Mon Sep 17 00:00:00 2001 From: Ac_K Date: Wed, 7 Dec 2022 01:49:37 +0100 Subject: [PATCH] gtk: Fixes warnings about obsolete components (#4049) * gtk: Fixes warnings about obsolete components * remove wrong using --- Ryujinx/Ui/Windows/AvatarWindow.cs | 4 ++-- .../UserProfilesManagerWindow.Designer.cs | 21 ++++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Ryujinx/Ui/Windows/AvatarWindow.cs b/Ryujinx/Ui/Windows/AvatarWindow.cs index 6dc860f3c..c715907d7 100644 --- a/Ryujinx/Ui/Windows/AvatarWindow.cs +++ b/Ryujinx/Ui/Windows/AvatarWindow.cs @@ -46,7 +46,7 @@ namespace Ryujinx.Ui.Windows SetDefaultSize(740, 400); SetPosition(WindowPosition.Center); - VBox vbox = new VBox(false, 0); + Box vbox = new(Orientation.Vertical, 0); Add(vbox); ScrolledWindow scrolledWindow = new ScrolledWindow @@ -55,7 +55,7 @@ namespace Ryujinx.Ui.Windows }; scrolledWindow.SetPolicy(PolicyType.Automatic, PolicyType.Automatic); - HBox hbox = new HBox(false, 0); + Box hbox = new(Orientation.Horizontal, 0); Button chooseButton = new Button() { diff --git a/Ryujinx/Ui/Windows/UserProfilesManagerWindow.Designer.cs b/Ryujinx/Ui/Windows/UserProfilesManagerWindow.Designer.cs index 702912905..7c9ae8baa 100644 --- a/Ryujinx/Ui/Windows/UserProfilesManagerWindow.Designer.cs +++ b/Ryujinx/Ui/Windows/UserProfilesManagerWindow.Designer.cs @@ -52,7 +52,8 @@ namespace Ryujinx.Ui.Windows _selectedLabel = new Label("Selected User Profile:") { Margin = 15, - Attributes = new AttrList() + Attributes = new AttrList(), + Halign = Align.Start }; _selectedLabel.Attributes.Insert(new Pango.AttrWeight(Weight.Bold)); @@ -136,7 +137,8 @@ namespace Ryujinx.Ui.Windows _availableUsersLabel = new Label("Available User Profiles:") { Margin = 15, - Attributes = new AttrList() + Attributes = new AttrList(), + Halign = Align.Start }; _availableUsersLabel.Attributes.Insert(new Pango.AttrWeight(Weight.Bold)); @@ -226,10 +228,9 @@ namespace Ryujinx.Ui.Windows _usersTreeViewWindow.Add(_usersTreeView); _usersTreeViewBox.Add(_usersTreeViewWindow); - - _bottomBox.PackStart(new Gtk.Alignment(-1, 0, 0, 0) { _addButton }, false, false, 0); - _bottomBox.PackStart(new Gtk.Alignment(-1, 0, 0, 0) { _deleteButton }, false, false, 0); - _bottomBox.PackEnd(new Gtk.Alignment(1, 0, 0, 0) { _closeButton }, false, false, 0); + _bottomBox.PackStart(_addButton, false, false, 0); + _bottomBox.PackStart(_deleteButton, false, false, 0); + _bottomBox.PackEnd(_closeButton, false, false, 0); _selectedUserInfoBox.Add(_selectedUserNameEntry); _selectedUserInfoBox.Add(_selectedUserIdLabel); @@ -238,12 +239,12 @@ namespace Ryujinx.Ui.Windows _selectedUserButtonsBox.Add(_changeProfileImageButton); _selectedUserBox.Add(_selectedUserImage); - _selectedUserBox.PackStart(new Gtk.Alignment(-1, 0, 0, 0) { _selectedUserInfoBox }, true, true, 0); - _selectedUserBox.Add(_selectedUserButtonsBox); + _selectedUserBox.PackStart(_selectedUserInfoBox, false, false, 0); + _selectedUserBox.PackEnd(_selectedUserButtonsBox, false, false, 0); - _mainBox.PackStart(new Gtk.Alignment(-1, 0, 0, 0) { _selectedLabel }, false, false, 0); + _mainBox.PackStart(_selectedLabel, false, false, 0); _mainBox.PackStart(_selectedUserBox, false, true, 0); - _mainBox.PackStart(new Gtk.Alignment(-1, 0, 0, 0) { _availableUsersLabel }, false, false, 0); + _mainBox.PackStart(_availableUsersLabel, false, false, 0); _mainBox.Add(_usersTreeViewBox); _mainBox.Add(_bottomBox);