[iagno/arnaudb/wip/gtk4: 13/54] Adapt to DrawingArea API.
- From: Arnaud B. <arnaudb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [iagno/arnaudb/wip/gtk4: 13/54] Adapt to DrawingArea API.
- Date: Thu, 30 Apr 2020 13:18:31 +0000 (UTC)
commit e2eaed234e08535a2dddffde573a32a471dba772
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date: Fri Feb 14 07:02:33 2020 +0100
Adapt to DrawingArea API.
src/history-button.vala | 8 ++++----
src/reversi-view.vala | 7 +++----
2 files changed, 7 insertions(+), 8 deletions(-)
---
diff --git a/src/history-button.vala b/src/history-button.vala
index f71dd87..5b45703 100644
--- a/src/history-button.vala
+++ b/src/history-button.vala
@@ -36,7 +36,7 @@ private class HistoryButton : MenuButton, AdaptativeWidget
construct
{
drawing.size_allocate.connect (on_drawing_size_allocate);
- drawing.draw.connect (update_drawing);
+ drawing.set_draw_func (update_drawing);
theme_manager.theme_changed.connect (() => {
if (!drawing_configured)
return;
@@ -112,17 +112,17 @@ private class HistoryButton : MenuButton, AdaptativeWidget
tiles_pattern = new Cairo.Pattern.for_surface (surface);
}
- private bool update_drawing (Cairo.Context cr)
+ private void update_drawing (Gtk.DrawingArea _drawing, Cairo.Context cr, int width, int height)
{
if (!drawing_configured)
- return false;
+ return;
if (tiles_pattern == null)
init_pattern (cr);
draw_arrow (cr);
draw_piece (cr);
- return true;
+ return;
}
private const double arrow_margin_top = 3.0;
diff --git a/src/reversi-view.vala b/src/reversi-view.vala
index 4c9f2d1..7e2b7fc 100644
--- a/src/reversi-view.vala
+++ b/src/reversi-view.vala
@@ -170,6 +170,7 @@ private class ReversiView : Gtk.DrawingArea
init_mouse ();
init_keyboard ();
+ set_draw_func (draw);
size_allocate.connect (on_size_allocate);
theme_manager.theme_changed.connect (() => {
@@ -261,10 +262,10 @@ private class ReversiView : Gtk.DrawingArea
}
}
- protected override bool draw (Cairo.Context cr)
+ private void draw (Gtk.DrawingArea _this, Cairo.Context cr, int width, int height)
{
if (!game_is_set)
- return false;
+ return;
if (board_pattern == null || tiles_pattern == null || render_size != tile_size)
init_patterns (cr);
@@ -291,8 +292,6 @@ private class ReversiView : Gtk.DrawingArea
draw_playables (cr);
else
draw_overture_playables (cr);
-
- return false;
}
private inline void init_patterns (Cairo.Context cr)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]