diff options
Diffstat (limited to 'lib/astal/gtk3/src')
-rw-r--r-- | lib/astal/gtk3/src/config.vala.in | 1 | ||||
-rw-r--r-- | lib/astal/gtk3/src/meson.build | 1 | ||||
-rw-r--r-- | lib/astal/gtk3/src/widget/circularprogress.vala | 2 | ||||
-rw-r--r-- | lib/astal/gtk3/src/widget/icon.vala | 19 | ||||
-rw-r--r-- | lib/astal/gtk3/src/widget/slider.vala | 12 | ||||
-rw-r--r-- | lib/astal/gtk3/src/widget/window.vala | 9 |
6 files changed, 39 insertions, 5 deletions
diff --git a/lib/astal/gtk3/src/config.vala.in b/lib/astal/gtk3/src/config.vala.in index 88bfe9c..a141571 100644 --- a/lib/astal/gtk3/src/config.vala.in +++ b/lib/astal/gtk3/src/config.vala.in @@ -1,3 +1,4 @@ +[CCode (gir_namespace = "Astal", gir_version = "@API_VERSION@")] namespace Astal { public const int MAJOR_VERSION = @MAJOR_VERSION@; public const int MINOR_VERSION = @MINOR_VERSION@; diff --git a/lib/astal/gtk3/src/meson.build b/lib/astal/gtk3/src/meson.build index bf8f72a..2587b10 100644 --- a/lib/astal/gtk3/src/meson.build +++ b/lib/astal/gtk3/src/meson.build @@ -10,6 +10,7 @@ config = configure_file( input: 'config.vala.in', output: 'config.vala', configuration: { + 'API_VERSION': api_version, 'VERSION': meson.project_version(), 'MAJOR_VERSION': version_split[0], 'MINOR_VERSION': version_split[1], diff --git a/lib/astal/gtk3/src/widget/circularprogress.vala b/lib/astal/gtk3/src/widget/circularprogress.vala index df1635d..de7a5c7 100644 --- a/lib/astal/gtk3/src/widget/circularprogress.vala +++ b/lib/astal/gtk3/src/widget/circularprogress.vala @@ -41,7 +41,7 @@ public class Astal.CircularProgress : Gtk.Bin { } static construct { - set_css_name("circular-progress"); + set_css_name("circularprogress"); } public override Gtk.SizeRequestMode get_request_mode() { diff --git a/lib/astal/gtk3/src/widget/icon.vala b/lib/astal/gtk3/src/widget/icon.vala index 9a20359..ee6808c 100644 --- a/lib/astal/gtk3/src/widget/icon.vala +++ b/lib/astal/gtk3/src/widget/icon.vala @@ -9,7 +9,21 @@ public class Astal.Icon : Gtk.Image { private double size { get; set; default = 14; } public new Gdk.Pixbuf pixbuf { get; set; } - public GLib.Icon g_icon { get; set; } + + private static bool gicon_warned = false; + [Version (deprecated = true, deprecated_since = "0.1.0", replacement = "gicon")] + public GLib.Icon g_icon { + owned get { + return this.gicon; + } + set { + if( !gicon_warned ) { + GLib.warning("g-icon is deprecated. Use gicon instead."); + gicon_warned = true; + } + this.gicon = value; + } + } /** * Either a named icon or a path to a file. @@ -57,7 +71,6 @@ public class Astal.Icon : Gtk.Image { break; case IconType.GICON: pixel_size = (int)size; - gicon = g_icon; break; } @@ -86,7 +99,7 @@ public class Astal.Icon : Gtk.Image { display_icon.begin(); }); - notify["g-icon"].connect(() => { + notify["gicon"].connect(() => { type = IconType.GICON; display_icon.begin(); }); diff --git a/lib/astal/gtk3/src/widget/slider.vala b/lib/astal/gtk3/src/widget/slider.vala index 97cfb69..b927e32 100644 --- a/lib/astal/gtk3/src/widget/slider.vala +++ b/lib/astal/gtk3/src/widget/slider.vala @@ -30,6 +30,10 @@ public class Astal.Slider : Gtk.Scale { step = 0.05; } + if (page == 0) { + page = 0.01; + } + notify["orientation"].connect(() => { notify_property("vertical"); }); @@ -90,5 +94,13 @@ public class Astal.Slider : Gtk.Scale { set { adjustment.step_increment = value; } } + /** + * Size of page increments. Defaults to `0.01`. + */ + public double page { + get { return adjustment.page_increment; } + set { adjustment.page_increment = value; } + } + // TODO: marks } diff --git a/lib/astal/gtk3/src/widget/window.vala b/lib/astal/gtk3/src/widget/window.vala index 11d542d..a066806 100644 --- a/lib/astal/gtk3/src/widget/window.vala +++ b/lib/astal/gtk3/src/widget/window.vala @@ -50,6 +50,13 @@ public class Astal.Window : Gtk.Window { private InhibitManager? inhibit_manager; private Inhibitor? inhibitor; + /** + * Get the current [[email protected]] this window resides in. + */ + public Gdk.Monitor get_current_monitor() { + return Gdk.Display.get_default().get_monitor_at_window(base.get_window()); + } + private bool check(string action) { if (!is_supported()) { critical(@"can not $action on window: layer shell not supported"); @@ -63,7 +70,7 @@ public class Astal.Window : Gtk.Window { } construct { - // If the window has no size allocatoted when it gets mapped. + // If the window has no size allocatoted when it gets mapped // It won't show up later either when it size changes by adding children. height_request = 1; width_request = 1; |