Skip to content

Gtk4Prep: Update Gtk.Popover construction #1764

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 1 commit into from
Jul 6, 2026
+18 −19
Merged

Gtk4Prep: Update Gtk.Popover construction #1764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 2 additions & 4 deletions src/Widgets/ChooseProjectButton.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,11 +110,9 @@ public class Code.ChooseProjectButton : Gtk.MenuButton {
popover_content.show_all ();

var project_popover = new Gtk.Popover (this) {
position = Gtk.PositionType.BOTTOM
position = Gtk.PositionType.BOTTOM,
child = popover_content
};

project_popover.add (popover_content);

popover = project_popover;

// Initialise with any pre-existing projects (needed for second and subsequent window)
Expand Down
21 changes: 10 additions & 11 deletions src/Widgets/FormatBar.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,10 +119,10 @@ public class Code.FormatBar : Gtk.Box {

popover_content.show_all ();

var lang_popover = new Gtk.Popover (lang_menubutton);
lang_popover.position = Gtk.PositionType.BOTTOM;
lang_popover.add (popover_content);

var lang_popover = new Gtk.Popover (lang_menubutton) {
position = Gtk.PositionType.BOTTOM,
child = popover_content
};
lang_menubutton.popover = lang_popover;

lang_selection_listbox.row_activated.connect ((row) => {
Expand Down Expand Up @@ -180,10 +180,9 @@ public class Code.FormatBar : Gtk.Box {
box.show_all ();

var tab_popover = new Gtk.Popover (tab_menubutton) {
position = Gtk.PositionType.BOTTOM
position = Gtk.PositionType.BOTTOM,
child = box
};
tab_popover.add (box);

tab_menubutton.popover = tab_popover;

Scratch.settings.changed["indent-width"].connect (format_tab_header_from_global_settings);
Expand Down Expand Up @@ -251,10 +250,10 @@ public class Code.FormatBar : Gtk.Box {
line_grid.attach (goto_entry, 1, 0, 1, 1);
line_grid.show_all ();

var line_popover = new Gtk.Popover (line_menubutton);
line_popover.position = Gtk.PositionType.BOTTOM;
line_popover.add (line_grid);

var line_popover = new Gtk.Popover (line_menubutton) {
position = Gtk.PositionType.BOTTOM,
child = line_grid
};
line_menubutton.popover = line_popover;

// We need to connect_after because otherwise, the text isn't parsed into the "value" property and we only get the previous value
Expand Down
5 changes: 3 additions & 2 deletions src/Widgets/HeaderBar.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,8 +225,9 @@ public class Scratch.HeaderBar : Hdy.HeaderBar {
menu_box.add (preferences_menuitem);
menu_box.show_all ();

var menu = new Gtk.Popover (null);
menu.add (menu_box);
var menu = new Gtk.Popover (null) {
child = menu_box
};

var app_menu = new Gtk.MenuButton () {
image = new Gtk.Image.from_icon_name ("open-menu", Gtk.IconSize.LARGE_TOOLBAR),
Expand Down
5 changes: 3 additions & 2 deletions src/Widgets/SearchBar.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,8 +172,9 @@ namespace Scratch.Widgets {
search_option_box.add (whole_word_search_button);
search_option_box.add (regex_search_button);

var search_popover = new Gtk.Popover (null);
search_popover.add (search_option_box);
var search_popover = new Gtk.Popover (null) {
child = search_option_box
};
search_popover.show_all ();

var search_buttonbox = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 6);
Expand Down