Merge lp:~fabiozaramella/screenshot-tool/minor-fixes into lp:~elementary-apps/screenshot-tool/trunk

[Fabio Zaramella]

* Hide main window behind save dialog when app is launched from command
* Show main window after window not found error

Hides main window behind save dialog when app is launched from command

[Adam Bieńkowski (donadigo)]

Hm, is there a reason for the change on diff line 9? The condition now seems wrong for me.

review: Needs Information (code)

[lp:~fabiozaramella/screenshot-tool/minor-fixes]

301. By Fabio Zaramella on 2017-02-16

Correct wrongly changed condition

[Fabio Zaramella (fabiozaramella)]

Ops, you're right. I changed it and didn't noticed. Thank you :)

review: Needs Resubmitting

[Danielle Foré (danrabbit)]

This branch makes it so I can't capture "windowed" screenshots of the panel indicators

review: Needs Fixing

[lp:~fabiozaramella/screenshot-tool/minor-fixes]

302. By Fabio Zaramella on 2017-02-17

revert behaviour, allow avery type of windows

[Fabio Zaramella (fabiozaramella)]

You're right Daniel. Unfortunately this prevent popover to be captured, so I'll leave it as it was.

review: Needs Resubmitting

=== modified file 'src/Screenshot.vala'
--- src/Screenshot.vala	2017-02-05 18:37:23 +0000
+++ src/Screenshot.vala	2017-02-17 19:10:55 +0000
@@ -102,8 +102,9 @@
         }
 
         public static ScreenshotApp get_instance () {
-            if (app == null)
+            if (app == null) {
                 app = new ScreenshotApp ();
+            }
 
             return app;
         }

=== modified file 'src/ScreenshotWindow.vala'
--- src/ScreenshotWindow.vala	2017-02-12 16:14:51 +0000
+++ src/ScreenshotWindow.vala	2017-02-17 19:10:55 +0000
@@ -193,6 +193,8 @@
 
             close_on_save = true;
             from_command = true;
+
+            this.set_opacity (0);
         }
 
         private bool grab_save (Gdk.Window? win, bool extra_time) {
@@ -206,7 +208,9 @@
             }
 
             Timeout.add (250, () => {
-                this.set_opacity (1);
+                if (from_command == false) {
+                    this.set_opacity (1);
+                }
                 return false;
             });
 
@@ -349,6 +353,7 @@
 
         public void take_clicked () {
             this.set_opacity (0);
+
             switch (capture_mode) {
                 case CaptureType.SCREEN:
                     capture_screen ();
@@ -401,6 +406,12 @@
                     dialog.deletable = false;
                     dialog.run ();
                     dialog.destroy ();
+
+                    if (from_command == false) {
+                        this.set_opacity (1);
+                    } else {
+                        this.destroy ();
+                    }
                 }
 
                 return false;