Skip to content

Replace Bin with Box as base class for BranchListBox #1729

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

Draft
jeremypw wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −7
Draft

Replace Bin with Box as base class for BranchListBox #1729

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
14 changes: 7 additions & 7 deletions src/Dialogs/BranchActions/BranchListBox.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*
* Authored by: Jeremy Wootten <jeremywootten@gmail.com>
*/
private class Scratch.Dialogs.BranchListBox : Gtk.Bin {
private class Scratch.Dialogs.BranchListBox : Gtk.Box {

public signal void branch_changed (string branch_name);

Expand All @@ -31,6 +31,9 @@ private class Scratch.Dialogs.BranchListBox : Gtk.Bin {
}

construct {
orientation = VERTICAL;
spacing = 6;

list_box = new Gtk.ListBox () {
activate_on_single_click = false
};
Expand All @@ -47,12 +50,6 @@ private class Scratch.Dialogs.BranchListBox : Gtk.Bin {
placeholder_text = _("Enter search term")
};

var box = new Gtk.Box (VERTICAL, 6);
box.add (search_entry);
box.add (scrolled_window);

child = box;

recent_header = new Granite.HeaderLabel (_("Recent Branches"));
local_header = new Granite.HeaderLabel (_("Local Branches"));
remote_header = new Granite.HeaderLabel (_("Remote Branches"));
Expand Down Expand Up @@ -91,6 +88,9 @@ private class Scratch.Dialogs.BranchListBox : Gtk.Bin {
search_entry.activate.connect (() => {
dialog.page_activated ();
});

add (search_entry);
add (scrolled_window);
}

public BranchNameRow? get_selected_row () {
Expand Down