Merge lp:~davidgomes/pantheon-terminal/fixed-1082112 into lp:~elementary-apps/pantheon-terminal/trunk

Proposed by David Gomes
Status: Merged
Merged at revision: 423
Proposed branch: lp:~davidgomes/pantheon-terminal/fixed-1082112
Merge into: lp:~elementary-apps/pantheon-terminal/trunk
Diff against target: 67 lines (+15/-7)
1 file modified
src/PantheonTerminalWindow.vala (+15/-7)
To merge this branch: bzr merge lp:~davidgomes/pantheon-terminal/fixed-1082112
Reviewer Review Type Date Requested Status
Akshay Shekher (community) Approve
Review via email: mp+141659@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Akshay Shekher (voldyman) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/PantheonTerminalWindow.vala'
2--- src/PantheonTerminalWindow.vala 2012-12-31 07:33:54 +0000
3+++ src/PantheonTerminalWindow.vala 2013-01-02 19:30:26 +0000
4@@ -279,10 +279,13 @@
5 }
6 }
7
8- if (PantheonTerminal.saved_state.window_state == PantheonTerminalWindowState.MAXIMIZED)
9+ if (PantheonTerminal.saved_state.window_state == PantheonTerminalWindowState.MAXIMIZED) {
10 maximize ();
11- else if (PantheonTerminal.saved_state.window_state == PantheonTerminalWindowState.FULLSCREEN)
12+ notebook.margin_top = 3;
13+ } else if (PantheonTerminal.saved_state.window_state == PantheonTerminalWindowState.FULLSCREEN) {
14 fullscreen ();
15+ notebook.margin_top = 0;
16+ }
17
18 /* Reset saved state to avoid restoring it again */
19 saved_state.window_state = PantheonTerminalWindowState.NORMAL;
20@@ -322,12 +325,13 @@
21
22 private void update_saved_state () {
23 /* Save window state */
24- if ((get_window ().get_state () & WindowState.MAXIMIZED) != 0)
25+ if ((get_window ().get_state () & WindowState.MAXIMIZED) != 0) {
26 PantheonTerminal.saved_state.window_state = PantheonTerminalWindowState.MAXIMIZED;
27- else if ((get_window ().get_state () & WindowState.FULLSCREEN) != 0)
28+ } else if ((get_window ().get_state () & WindowState.FULLSCREEN) != 0) {
29 PantheonTerminal.saved_state.window_state = PantheonTerminalWindowState.FULLSCREEN;
30- else
31+ } else {
32 PantheonTerminal.saved_state.window_state = PantheonTerminalWindowState.NORMAL;
33+ }
34
35 /* Save window size */
36 if (PantheonTerminal.saved_state.window_state == PantheonTerminalWindowState.NORMAL) {
37@@ -342,6 +346,7 @@
38 foreach (var t in terminals) {
39 t = (TerminalWidget) t;
40 tab_loc = t.get_shell_location ();
41+
42 if (tab_loc != "")
43 saved_state.tabs += tab_loc + ",";
44 }
45@@ -438,6 +443,7 @@
46 t.child_exited.connect (() => {
47 if (closed_by_exit)
48 notebook.remove_tab (tab);
49+
50 closed_by_exit = true;
51 });
52
53@@ -560,10 +566,12 @@
54
55 void action_fullscreen () {
56 if (is_fullscreen) {
57- unfullscreen();
58+ notebook.margin_top = 3;
59+ unfullscreen ();
60 is_fullscreen = false;
61 } else {
62- fullscreen();
63+ notebook.margin_top = 0;
64+ fullscreen ();
65 is_fullscreen = true;
66 }
67 }

Subscribers

People subscribed via source and target branches