Skip to content

Gtk4Prep: Replace margin property with margin_top etc #1743

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danirabbit merged 2 commits into from
Jun 23, 2026
+28 −10
Merged

Gtk4Prep: Replace margin property with margin_top etc #1743

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39f7ab0
Replace margin property with margin_top etc
jeremypw Jun 23, 2026
801e02e
Fix typos
jeremypw Jun 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 12 additions & 5 deletions plugins/pastebin/pastebin_dialog.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -316,8 +316,10 @@ namespace Scratch.Dialogs {
};

stack = new Gtk.Stack () {
margin = 12,
margin_top = 0
margin_top = 0,
margin_bottom = 12,
margin_start = 12,
margin_end = 12
};
stack.add (grid);
stack.add (spinner);
Expand Down Expand Up @@ -362,7 +364,10 @@ namespace Scratch.Dialogs {
for (var i=0; i < languages.length[0]; i++) {
var label = new Gtk.Label (languages[i, 2]) {
halign = Gtk.Align.START,
margin = 6
margin_top = 6,
margin_bottom = 6,
margin_start = 6,
margin_end = 6
};

languages_listbox.add (label);
Expand All @@ -382,8 +387,10 @@ namespace Scratch.Dialogs {
select_button.clicked.connect (select_button_clicked);

var frame = new Gtk.Frame (null) {
margin = 12,
margin_top = 0
margin_top = 0,
margin_bottom = 12,
margin_start = 12,
margin_end = 12
};
frame.add (languages_scrolled);

Expand Down
5 changes: 4 additions & 1 deletion src/Dialogs/PreferencesDialog.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,10 @@ public class Scratch.Dialogs.Preferences : Granite.Dialog {
interface_box.add (font_box);

var stack = new Gtk.Stack () {
margin = 12,
margin_top = 12,
margin_bottom = 12,
margin_start = 12,
margin_end = 12,
vhomogeneous = true
};
stack.add_titled (behavior_box, "behavior", _("Behavior"));
Expand Down
4 changes: 3 additions & 1 deletion src/Widgets/ChooseProjectButton.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,10 @@ public class Code.ChooseProjectButton : Gtk.MenuButton {
selection_mode = Gtk.SelectionMode.SINGLE
};
var project_filter = new Gtk.SearchEntry () {
margin = 12,
margin_top = 12,
margin_bottom = 6,
margin_start = 12,
margin_end = 12,
placeholder_text = _("Filter projects")
};

Expand Down
12 changes: 9 additions & 3 deletions src/Widgets/FormatBar.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,10 @@ public class Code.FormatBar : Gtk.Box {
});

lang_selection_filter = new Gtk.SearchEntry () {
margin = 12,
margin_top = 12,
margin_bottom = 6,
margin_start = 12,
margin_end = 12,
placeholder_text = _("Filter languages")
};

Expand Down Expand Up @@ -238,8 +240,12 @@ public class Code.FormatBar : Gtk.Box {

goto_entry = new Gtk.Entry ();

var line_grid = new Gtk.Grid ();
line_grid.margin = 12;
var line_grid = new Gtk.Grid () {
margin_top = 12,
margin_bottom = 12,
margin_start = 12,
margin_end = 12
};
line_grid.column_spacing = 12;
line_grid.attach (goto_label, 0, 0, 1, 1);
line_grid.attach (goto_entry, 1, 0, 1, 1);
Expand Down