Merge lp:~elementary-apps/pantheon-terminal/fix-fullscreen into lp:~elementary-apps/pantheon-terminal/trunk

[David Gomes]

Removes some window.margin_top legacy code and fixes bug #1308781.

Yes, I realize this is a bad branch name but I can't find the associated bug ID, which should be put in the final commit message.

Basically, we had a workaround for Terminal's old title bar and we (cough cough Daniel) forgot to remove some legacy code.

This does that and fixes a bug in the Terminal where coming back from fullscreen would add an empty margin on top.

[David Gomes (davidgomes)]

Daniel found the bug, it's bug 1308781.

[Niclas Lockner (niclasl)]

review: Approve

=== modified file 'src/PantheonTerminalWindow.vala'
--- src/PantheonTerminalWindow.vala	2014-04-15 14:17:12 +0000
+++ src/PantheonTerminalWindow.vala	2014-04-22 19:34:21 +0000
@@ -265,10 +265,8 @@
 
             if (PantheonTerminal.saved_state.window_state == PantheonTerminalWindowState.MAXIMIZED) {
                 maximize ();
-                notebook.margin_top = 3;
             } else if (PantheonTerminal.saved_state.window_state == PantheonTerminalWindowState.FULLSCREEN) {
                 fullscreen ();
-                notebook.margin_top = 0;
             }
 
             /* Reset saved state to avoid restoring it again */
@@ -617,11 +615,9 @@
 
         void action_fullscreen () {
             if (is_fullscreen) {
-                notebook.margin_top = 3;
                 unfullscreen ();
                 is_fullscreen = false;
             } else {
-                notebook.margin_top = 0;
                 fullscreen ();
                 is_fullscreen = true;
             }
@@ -676,4 +672,4 @@
               action_fullscreen }
         };
     }
-}
\ No newline at end of file
+}