Skip to content
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

Jump to bottom

Display character size on dragging window edges #647

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft

Display character size on dragging window edges #647

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9f2948e
Add display of character size on window resize
Roshan-R Dec 30, 2021
0103e1e
removed gtklabel bug
Roshan-R Dec 30, 2021
e6409b5
removed size_revealer hiding by default
Roshan-R Dec 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
48 changes: 47 additions & 1 deletion src/MainWindow.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,8 @@ namespace Terminal {
private Gtk.ToggleButton search_button;
private Gtk.Button zoom_default_button;
private Granite.AccelLabel open_in_browser_menuitem_label;
private Gtk.Revealer size_revealer;
private Gtk.Label size_label;

private HashTable<string, TerminalWidget> restorable_terminals;
private bool is_fullscreen = false;
Expand All @@ -50,11 +52,15 @@ namespace Terminal {
public bool recreate_tabs { get; construct; default = true; }
public bool restore_pos { get; construct; default = true; }
public uint focus_timeout { get; private set; default = 0;}
public uint size_timeout { get; private set; default = 0;}
public Gtk.Menu menu { get; private set; }
public Terminal.Application app { get; construct; }
public SimpleActionGroup actions { get; construct; }
public TerminalWidget current_terminal { get; private set; default = null; }

public long last_x;
public long last_y;

public GLib.List <TerminalWidget> terminals = new GLib.List <TerminalWidget> ();

public const string ACTION_PREFIX = "win.";
Expand Down Expand Up @@ -259,6 +265,9 @@ namespace Terminal {
setup_ui ();
show_all ();

last_x = current_terminal.get_column_count();
last_y = current_terminal.get_row_count();

search_revealer.set_reveal_child (false);

update_font ();
Expand Down Expand Up @@ -512,10 +521,24 @@ namespace Terminal {
var tab_bar_behavior = Application.settings.get_enum ("tab-bar-behavior");
notebook.tab_bar_behavior = (Granite.Widgets.DynamicNotebook.TabBarBehavior)tab_bar_behavior;

size_label = new Gtk.Label("");
size_label.set_valign(Gtk.Align.CENTER);

size_revealer = new Gtk.Revealer ();
size_revealer.set_transition_type(Gtk.RevealerTransitionType.CROSSFADE);
size_revealer.set_valign(Gtk.Align.CENTER);
size_revealer.add (size_label);

var overlay = new Gtk.Overlay();
overlay.add(notebook);
overlay.add_overlay (size_revealer);
overlay.set_overlay_pass_through(size_revealer,true);

var grid = new Gtk.Grid ();
grid.attach (header, 0, 0);
grid.attach (search_revealer, 0, 1);
grid.attach (notebook, 0, 2);
grid.attach (overlay, 0, 2);
grid.size_allocate.connect(size_changed);

get_style_context ().add_class ("terminal-window");
add (grid);
Expand Down Expand Up @@ -1367,6 +1390,29 @@ namespace Terminal {
app.new_window ();
}

private void size_changed(){

long x = current_terminal.get_column_count();
long y = current_terminal.get_row_count();

if(last_x == x && last_y == y){
return;
}

last_x = x;
last_y = y;

size_label.set_text(x.to_string() + " x " + y.to_string());

GLib.Source.remove(size_timeout);
size_timeout = GLib.Timeout.add(800, ()=>{
size_revealer.set_reveal_child (false);
return true;
});

size_revealer.set_reveal_child (true);
}

private void action_new_tab () {
if (Application.settings.get_boolean ("follow-last-tab")) {
new_tab (current_terminal.get_shell_location ());
Expand Down