Skip to content

Commit bb76b3a

Browse files
authored
Gtk4Prep: Replace margin property with margin_top etc (#1743)
1 parent ba96b84 commit bb76b3a

4 files changed

Lines changed: 28 additions & 10 deletions

File tree

plugins/pastebin/pastebin_dialog.vala

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,10 @@ namespace Scratch.Dialogs {
316316
};
317317

318318
stack = new Gtk.Stack () {
319-
margin = 12,
320-
margin_top = 0
319+
margin_top = 0,
320+
margin_bottom = 12,
321+
margin_start = 12,
322+
margin_end = 12
321323
};
322324
stack.add (grid);
323325
stack.add (spinner);
@@ -362,7 +364,10 @@ namespace Scratch.Dialogs {
362364
for (var i=0; i < languages.length[0]; i++) {
363365
var label = new Gtk.Label (languages[i, 2]) {
364366
halign = Gtk.Align.START,
365-
margin = 6
367+
margin_top = 6,
368+
margin_bottom = 6,
369+
margin_start = 6,
370+
margin_end = 6
366371
};
367372

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

384389
var frame = new Gtk.Frame (null) {
385-
margin = 12,
386-
margin_top = 0
390+
margin_top = 0,
391+
margin_bottom = 12,
392+
margin_start = 12,
393+
margin_end = 12
387394
};
388395
frame.add (languages_scrolled);
389396

src/Dialogs/PreferencesDialog.vala

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,10 @@ public class Scratch.Dialogs.Preferences : Granite.Dialog {
143143
interface_box.add (font_box);
144144

145145
var stack = new Gtk.Stack () {
146-
margin = 12,
146+
margin_top = 12,
147+
margin_bottom = 12,
148+
margin_start = 12,
149+
margin_end = 12,
147150
vhomogeneous = true
148151
};
149152
stack.add_titled (behavior_box, "behavior", _("Behavior"));

src/Widgets/ChooseProjectButton.vala

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,10 @@ public class Code.ChooseProjectButton : Gtk.MenuButton {
6262
selection_mode = Gtk.SelectionMode.SINGLE
6363
};
6464
var project_filter = new Gtk.SearchEntry () {
65-
margin = 12,
65+
margin_top = 12,
6666
margin_bottom = 6,
67+
margin_start = 12,
68+
margin_end = 12,
6769
placeholder_text = _("Filter projects")
6870
};
6971

src/Widgets/FormatBar.vala

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,10 @@ public class Code.FormatBar : Gtk.Box {
8282
});
8383

8484
lang_selection_filter = new Gtk.SearchEntry () {
85-
margin = 12,
85+
margin_top = 12,
8686
margin_bottom = 6,
87+
margin_start = 12,
88+
margin_end = 12,
8789
placeholder_text = _("Filter languages")
8890
};
8991

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

239241
goto_entry = new Gtk.Entry ();
240242

241-
var line_grid = new Gtk.Grid ();
242-
line_grid.margin = 12;
243+
var line_grid = new Gtk.Grid () {
244+
margin_top = 12,
245+
margin_bottom = 12,
246+
margin_start = 12,
247+
margin_end = 12
248+
};
243249
line_grid.column_spacing = 12;
244250
line_grid.attach (goto_label, 0, 0, 1, 1);
245251
line_grid.attach (goto_entry, 1, 0, 1, 1);

0 commit comments

Comments
 (0)