development/gitg
development/gitg
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/gitg synced 2024-07-05 01:19:31 +00:00
Code Issues Projects Releases Wiki Activity

Remove additional unneeded scrolled window

Browse Source
This commit is contained in:
Jesse van den Kieboom 2015-08-27 19:31:41 +02:00 committed by Ignacio Casal Quinteiro
parent 048e32069b
commit 6ddc1f7ee7
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libgitg/gitg-diff-view.vala
View File

@ -23,6 +23,9 @@ public class Gitg.DiffView : Gtk.Grid
[GtkChild( name = "commit_details" )]
private Gitg.DiffViewCommitDetails d_commit_details;
[GtkChild( name = "scrolledwindow" )]
private Gtk.ScrolledWindow d_scrolledwindow;
[GtkChild( name = "grid_files" )]
private Gtk.Grid d_grid_files;
@ -206,11 +209,13 @@ public class Gitg.DiffView : Gtk.Grid
// the diff content
if (d_diff == null && d_commit == null)
{
hide();
d_commit_details.hide();
d_scrolledwindow.hide();
return;
}
show();
d_commit_details.show();
d_scrolledwindow.show();
// Cancel running operations
d_cancellable.cancel();

30
plugins/diff/gitg-diff.vala
View File

@ -27,17 +27,16 @@ namespace GitgDiff
public GitgExt.Application? application { owned get; construct set; }
public GitgExt.History? history { owned get; construct set; }
private Gtk.ScrolledWindow d_sw;
private Gitg.DiffView d_diff;
private Gitg.WhenMapped d_whenMapped;
private ulong d_selection_changed_id;
construct
{
d_sw = new Gtk.ScrolledWindow(null, null);
d_sw.show();
d_diff = new Gitg.DiffView();
d_diff.show_parents = true;
d_diff.show();
var settings = new Settings("org.gnome.gitg.preferences.diff");
@ -79,16 +78,27 @@ namespace GitgDiff
SettingsBindFlags.GET |
SettingsBindFlags.SET);
d_diff.show();
d_diff.notify["visible"].connect(() => {
stdout.printf(@"visible: $(d_diff.visible)\n");
});
d_sw.add(d_diff);
d_whenMapped = new Gitg.WhenMapped(d_diff);
d_whenMapped = new Gitg.WhenMapped(d_sw);
history.selection_changed.connect(on_selection_changed);
d_selection_changed_id = history.selection_changed.connect(on_selection_changed);
on_selection_changed(history);
}
protected override void dispose()
{
if (history != null && d_selection_changed_id != 0)
{
history.disconnect(d_selection_changed_id);
d_selection_changed_id = 0;
}
base.dispose();
}
public string id
{
owned get { return "/org/gnome/gitg/Panels/Diff"; }
@ -142,7 +152,7 @@ namespace GitgDiff
public Gtk.Widget? widget
{
owned get { return d_sw; }
owned get { return d_diff; }
}
public bool enabled