Merge lp:~elementary-apps/screenshot-tool/check-for-scribbles into lp:~elementary-apps/screenshot-tool/trunk

[Danielle Foré]

[Jung-Kyu Park (bagjunggyu)]

It fixes the issue conceal feature which should be concealed and restored text.

[Jeremy Wootten (jeremywootten)]

It would be better to stop the previous font ever being set to the scribble font, if possible - although this code should be kept as a backstop.

[Jeremy Wootten (jeremywootten)]

A similar but slightly different solution is included in the branch lp:~jeremywootten/screenshot-tool/fix-1438250-include-child-windows. In my case the problem was caused by the program crashing during development but the linked bug here does not mention any crashes (although they could have been silent). My branch reduces the time the spent in the redacted state a little.

Unmerged revisions

281. By Danielle Foré on 2017-02-03

check that we're not setting back to the scribble font

=== modified file 'src/ScreenshotWindow.vala'
--- src/ScreenshotWindow.vala	2017-01-27 20:52:33 +0000
+++ src/ScreenshotWindow.vala	2017-02-03 17:43:45 +0000
@@ -450,9 +450,15 @@
                 settings.set_string ("monospace-font-name", "Redacted Script Light 10");
                 settings.set_string ("document-font-name", "Redacted Script Regular 10");
             } else {
-                settings.set_string ("font-name", prev_font_regular);
-                settings.set_string ("monospace-font-name", prev_font_mono);
-                settings.set_string ("document-font-name", prev_font_document);
+                if (prev_font_regular != "Redacted Script Regular 9") {
+                    settings.set_string ("font-name", prev_font_regular);
+                    settings.set_string ("monospace-font-name", prev_font_mono);
+                    settings.set_string ("document-font-name", prev_font_document);
+                } else {
+                    settings.reset ("font-name");
+                    settings.reset ("monospace-font-name");
+                    settings.reset ("document-font-name");
+                }
             }
         }