[gnome-games/wip/exalm/gtk4: 217/238] ui: Drop state argument from GtkStyleContext functions
- From: Alexander Mikhaylenko <alexm src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-games/wip/exalm/gtk4: 217/238] ui: Drop state argument from GtkStyleContext functions
- Date: Mon, 19 Aug 2019 20:34:41 +0000 (UTC)
commit 69049f84831ab50306623eed4ed4a74b13807ada
Author: Alexander Mikhaylenko <exalm7659 gmail com>
Date: Wed Aug 1 15:10:45 2018 +0500
ui: Drop state argument from GtkStyleContext functions
src/ui/game-thumbnail.vala | 10 ++++------
src/ui/savestate-listbox-row.vala | 3 +--
2 files changed, 5 insertions(+), 8 deletions(-)
---
diff --git a/src/ui/game-thumbnail.vala b/src/ui/game-thumbnail.vala
index e6416fa4..ba167d48 100644
--- a/src/ui/game-thumbnail.vala
+++ b/src/ui/game-thumbnail.vala
@@ -61,7 +61,6 @@ private class Games.GameThumbnail : Gtk.DrawingArea {
public struct DrawingContext {
Cairo.Context cr;
Gtk.StyleContext style;
- Gtk.StateFlags state;
int width;
int height;
}
@@ -84,10 +83,9 @@ private class Games.GameThumbnail : Gtk.DrawingArea {
public void draw (Gtk.DrawingArea area, Cairo.Context cr, int width, int height) {
var style = get_style_context ();
- var state = get_state_flags ();
DrawingContext context = {
- cr, style, state, width, height
+ cr, style, width, height
};
if (icon == null)
@@ -129,7 +127,7 @@ private class Games.GameThumbnail : Gtk.DrawingArea {
if (pixbuf == null)
return false;
- var border_radius = (int) context.style.get_property (Gtk.STYLE_PROPERTY_BORDER_RADIUS,
context.state);
+ var border_radius = (int) context.style.get_property (Gtk.STYLE_PROPERTY_BORDER_RADIUS);
border_radius = border_radius.clamp (0, int.max (context.width / 2, context.height / 2));
context.cr.set_source_rgb (0, 0, 0);
@@ -150,7 +148,7 @@ private class Games.GameThumbnail : Gtk.DrawingArea {
private void draw_emblem_icon (DrawingContext context, string icon_name, double scale) {
Gdk.Pixbuf? emblem = null;
- var color = context.style.get_color (context.state);
+ var color = context.style.get_color ();
var theme = Gtk.IconTheme.get_default ();
var size = int.min (context.width, context.height) * scale * scale_factor;
@@ -320,7 +318,7 @@ private class Games.GameThumbnail : Gtk.DrawingArea {
private Cairo.Surface get_mask (DrawingContext context) {
var mask = new Cairo.ImageSurface (Cairo.Format.A8, context.width * scale_factor,
context.height * scale_factor);
- var border_radius = (int) context.style.get_property (Gtk.STYLE_PROPERTY_BORDER_RADIUS,
context.state);
+ var border_radius = (int) context.style.get_property (Gtk.STYLE_PROPERTY_BORDER_RADIUS);
border_radius = border_radius.clamp (0, int.max (context.width / 2, context.height / 2));
var cr = new Cairo.Context (mask);
diff --git a/src/ui/savestate-listbox-row.vala b/src/ui/savestate-listbox-row.vala
index e933cfd9..0817ab0a 100644
--- a/src/ui/savestate-listbox-row.vala
+++ b/src/ui/savestate-listbox-row.vala
@@ -135,8 +135,7 @@ private class Games.SavestateListBoxRow : Gtk.ListBoxRow {
var mask = new Cairo.ImageSurface (Cairo.Format.A8, width * scale_factor, height *
scale_factor);
var style = image.get_style_context ();
- var flags = image.get_state_flags ();
- var border_radius = (int) style.get_property (Gtk.STYLE_PROPERTY_BORDER_RADIUS, flags);
+ var border_radius = (int) style.get_property (Gtk.STYLE_PROPERTY_BORDER_RADIUS);
border_radius = border_radius.clamp (0, int.max (width / 2, height / 2));
var cr = new Cairo.Context (mask);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]