[gnome-mines/arnaudb/wip/gtk4: 30/36] Adapt to Widget CSS API.
- From: Arnaud B. <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-mines/arnaudb/wip/gtk4: 30/36] Adapt to Widget CSS API.
- Date: Sun, 26 Apr 2020 13:04:30 +0000 (UTC)
commit 4229cdf164e2d02affd64f3a5457ded3f3f16cd9
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Thu Apr 16 13:01:49 2020 +0200
Adapt to Widget CSS API.
src/minefield-view.vala | 46 +++++++++++++++++++++---------------------
src/theme-selector-dialog.vala | 2 +-
src/tile.vala | 12 +----------
3 files changed, 25 insertions(+), 35 deletions(-)
---
diff --git a/src/minefield-view.vala b/src/minefield-view.vala
index 0804f60..947508a 100644
--- a/src/minefield-view.vala
+++ b/src/minefield-view.vala
@@ -158,7 +158,7 @@ public class MinefieldView : Gtk.Grid
can_focus = true;
hexpand = true;
vexpand = true;
- get_style_context ().add_class ("minefield");
+ add_css_class ("minefield");
selected = new Position ();
selected.set_x.connect ((x) => { return x; });
@@ -181,8 +181,8 @@ public class MinefieldView : Gtk.Grid
SignalHandler.disconnect_by_func (_minefield, null, this);
}
_minefield = value;
- get_style_context ().remove_class ("explodedField");
- get_style_context ().remove_class ("completedField");
+ remove_css_class ("explodedField");
+ remove_css_class ("completedField");
mines = new Tile[_minefield.width, _minefield.height];
forall ((child) => { remove (child); });
for (int i = 0; i < _minefield.width; i++)
@@ -248,7 +248,7 @@ public class MinefieldView : Gtk.Grid
}
keyboard_cursor.is_set = false;
- mines[keyboard_cursor.x,keyboard_cursor.y].remove_class ("cursor");
+ mines[keyboard_cursor.x,keyboard_cursor.y].remove_css_class ("cursor");
keyboard_cursor.position = {selected.x, selected.y};
}
@@ -293,7 +293,7 @@ public class MinefieldView : Gtk.Grid
private void explode_cb (Minefield minefield)
{
- get_style_context ().add_class ("explodedField");
+ add_css_class ("explodedField");
/* Show the mines that we missed or the flags that were wrong */
for (var x = 0; x < minefield.width; x++)
for (var y = 0; y < minefield.height; y++)
@@ -305,7 +305,7 @@ public class MinefieldView : Gtk.Grid
private void complete_cb (Minefield minefield)
{
- get_style_context ().add_class ("completedField");
+ add_css_class ("completedField");
}
public override void measure (Gtk.Orientation orientation, int for_size, out int minimum, out int
natural, out int minimum_baseline, out int natural_baseline)
@@ -353,17 +353,17 @@ public class MinefieldView : Gtk.Grid
/* Draw explosion if have uncovered a mine */
if (minefield.has_mine (x, y))
{
- mines[x,y].add_class ("exploded");
+ mines[x,y].add_css_class ("exploded");
}
/* Indicate the number of mines around this location */
else
{
var n = minefield.get_n_adjacent_mines (x, y);
- mines[x,y].remove_class ("maybe");
- mines[x,y].remove_class ("flag");
- mines[x,y].add_class ("count");
+ mines[x,y].remove_css_class ("maybe");
+ mines[x,y].remove_css_class ("flag");
+ mines[x,y].add_css_class ("count");
if (n > 0)
- mines[x,y].add_class (@"surrounded-by-$n-mines");
+ mines[x,y].add_css_class (@"surrounded-by-$n-mines");
}
}
else
@@ -374,16 +374,16 @@ public class MinefieldView : Gtk.Grid
/* Draw flags on uncleared locations */
if (minefield.get_flag (x, y) == FlagType.FLAG)
{
- mines[x,y].add_class ("flag");
+ mines[x,y].add_css_class ("flag");
/* Cross out incorrect flags */
if (minefield.exploded && !minefield.has_mine (x, y))
{
- mines[x,y].add_class ("incorrect");
+ mines[x,y].add_css_class ("incorrect");
}
}
else if (minefield.exploded && minefield.has_mine (x, y))
{
- mines[x,y].add_class ("mine");
+ mines[x,y].add_css_class ("mine");
}
}
@@ -403,26 +403,26 @@ public class MinefieldView : Gtk.Grid
if (minefield.n_flags >= minefield.n_mines && use_question_marks)
{
minefield.set_flag (x, y, FlagType.MAYBE);
- mines[x,y].add_class ("maybe");
+ mines[x,y].add_css_class ("maybe");
}
else
{
minefield.set_flag (x, y, FlagType.FLAG);
- mines[x,y].add_class ("flag");
+ mines[x,y].add_css_class ("flag");
}
break;
case FlagType.MAYBE:
- mines[x,y].remove_class ("maybe");
+ mines[x,y].remove_css_class ("maybe");
minefield.set_flag (x, y, FlagType.NONE);
break;
case FlagType.FLAG:
- mines[x,y].remove_class ("flag");
+ mines[x,y].remove_css_class ("flag");
if (use_question_marks)
{
minefield.set_flag (x, y, FlagType.MAYBE);
- mines[x,y].add_class ("maybe");
+ mines[x,y].add_css_class ("maybe");
}
else
{
@@ -452,7 +452,7 @@ public class MinefieldView : Gtk.Grid
var x = keyboard_cursor.x;
var y = keyboard_cursor.y;
- mines[keyboard_cursor.x,keyboard_cursor.y].remove_class ("cursor");
+ mines[keyboard_cursor.x,keyboard_cursor.y].remove_css_class ("cursor");
switch (keyval)
{
@@ -507,20 +507,20 @@ public class MinefieldView : Gtk.Grid
if (x == keyboard_cursor.x && y == keyboard_cursor.y)
{
- mines[keyboard_cursor.x,keyboard_cursor.y].add_class ("cursor");
+ mines[keyboard_cursor.x,keyboard_cursor.y].add_css_class ("cursor");
return true;
}
if (!keyboard_cursor.is_set)
{
keyboard_cursor.is_set = true;
- mines[keyboard_cursor.x,keyboard_cursor.y].add_class ("cursor");
+ mines[keyboard_cursor.x,keyboard_cursor.y].add_css_class ("cursor");
return true;
}
keyboard_cursor.position = { (int) (x % _minefield.width), (int) (y % _minefield.height)};
- mines[keyboard_cursor.x,keyboard_cursor.y].add_class ("cursor");
+ mines[keyboard_cursor.x,keyboard_cursor.y].add_css_class ("cursor");
if (selected.is_set)
selected.position = {keyboard_cursor.x, keyboard_cursor.y};
diff --git a/src/theme-selector-dialog.vala b/src/theme-selector-dialog.vala
index 55a336f..5c6b703 100644
--- a/src/theme-selector-dialog.vala
+++ b/src/theme-selector-dialog.vala
@@ -123,7 +123,7 @@ public class ThemeSelectorDialog : Gtk.Dialog
buttons_holder.add (previous);
buttons_holder.add (next);
- buttons_holder.get_style_context ().add_class ("linked");
+ buttons_holder.add_css_class ("linked");
headerbar.pack_start (buttons_holder);
var themes = list_themes ();
diff --git a/src/tile.vala b/src/tile.vala
index adca644..690e42c 100644
--- a/src/tile.vala
+++ b/src/tile.vala
@@ -19,7 +19,7 @@ public class Tile : Gtk.Button
construct
{
can_focus = false;
- add_class ("tile");
+ add_css_class ("tile");
_gesture = new Gtk.GestureLongPress ();
_gesture.pressed.connect((x, y) =>
@@ -49,14 +49,4 @@ public class Tile : Gtk.Button
});
add_controller (_click_controller);
}
-
- public void add_class (string style_class)
- {
- get_style_context ().add_class (style_class);
- }
-
- public void remove_class (string style_class)
- {
- get_style_context ().remove_class (style_class);
- }
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]