summaryrefslogtreecommitdiff
path: root/src/renderers
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2021-08-17 06:41:54 +0200
committerJörg Frings-Fürst <debian@jff.email>2021-08-17 06:41:54 +0200
commite605fe5dffe686241847c67166fe2414b48ee2a8 (patch)
tree5b506de0a4faa0506d0cf053af8e9d7184aa59bf /src/renderers
parent6617f5ee51c94d05028ebceb3177ec0e3a87e78d (diff)
parent6a2a889a6de6b45fcc21e0050763858768610952 (diff)
Merge branch 'release/debian/0.7.3-1'debian/0.7.3-1
Diffstat (limited to 'src/renderers')
-rw-r--r--src/renderers/centerRenderer.vala2
-rw-r--r--src/renderers/pieRenderer.vala6
-rw-r--r--src/renderers/pieWindow.vala11
-rw-r--r--src/renderers/sliceRenderer.vala2
4 files changed, 13 insertions, 8 deletions
diff --git a/src/renderers/centerRenderer.vala b/src/renderers/centerRenderer.vala
index c28d7d4..2e528e9 100644
--- a/src/renderers/centerRenderer.vala
+++ b/src/renderers/centerRenderer.vala
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
-// Copyright 2011-2018 Simon Schneegans
+// Copyright 2011-2021 Simon Schneegans
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
diff --git a/src/renderers/pieRenderer.vala b/src/renderers/pieRenderer.vala
index 2f8aaf4..af5d5a3 100644
--- a/src/renderers/pieRenderer.vala
+++ b/src/renderers/pieRenderer.vala
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
-// Copyright 2011-2018 Simon Schneegans
+// Copyright 2011-2021 Simon Schneegans
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
@@ -378,7 +378,7 @@ public class PieRenderer : GLib.Object {
szy = 2; //half height, center to the bottom
break;
- //cuarter pie
+ //quarter pie
case ShowPieMode.CPIE_TOP_LEFT:
szx = 0; //half width, center to the left
szy = 0; //half height, center to the top
@@ -395,6 +395,8 @@ public class PieRenderer : GLib.Object {
szx = 2; //half width, center to the right
szy = 2; //half height, center to the bottom
break;
+
+ default: break;
}
if (reduce_szx == 0)
szx = 1; //don't reduce width
diff --git a/src/renderers/pieWindow.vala b/src/renderers/pieWindow.vala
index 6d258d8..554fb15 100644
--- a/src/renderers/pieWindow.vala
+++ b/src/renderers/pieWindow.vala
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
-// Copyright 2011-2018 Simon Schneegans
+// Copyright 2011-2021 Simon Schneegans
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
@@ -124,11 +124,12 @@ public class PieWindow : Gtk.Window {
this.set_skip_taskbar_hint(true);
this.set_skip_pager_hint(true);
this.set_keep_above(true);
- this.set_type_hint(Gdk.WindowTypeHint.DOCK);
+ this.set_type_hint(Gdk.WindowTypeHint.DIALOG);
this.set_decorated(false);
this.set_resizable(false);
this.icon_name = "gnome-pie";
- this.set_accept_focus(false);
+ this.set_accept_focus(true);
+ this.set_focus_on_map(true);
this.app_paintable = true;
// check for compositing
@@ -182,7 +183,9 @@ public class PieWindow : Gtk.Window {
});
this.focus_out_event.connect((w, e) => {
- this.cancel();
+ if (this.is_active) {
+ this.cancel();
+ }
return true;
});
diff --git a/src/renderers/sliceRenderer.vala b/src/renderers/sliceRenderer.vala
index 1041b7a..06b5775 100644
--- a/src/renderers/sliceRenderer.vala
+++ b/src/renderers/sliceRenderer.vala
@@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////
-// Copyright 2011-2018 Simon Schneegans
+// Copyright 2011-2021 Simon Schneegans
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the