[four-in-a-row/arnaudb/wip/gtk4: 14/27] Adapt to DrawingArea API.



commit c23866da155e496c46a737f4c37a973b8805d7ab
Author: Arnaud Bonatti <arnaud bonatti gmail com>
Date:   Sun Apr 19 19:59:42 2020 +0200

    Adapt to DrawingArea API.

 src/game-board-view.vala | 5 ++---
 src/history-button.vala  | 7 +++----
 2 files changed, 5 insertions(+), 7 deletions(-)
---
diff --git a/src/game-board-view.vala b/src/game-board-view.vala
index 0dd6106..2ebd0af 100644
--- a/src/game-board-view.vala
+++ b/src/game-board-view.vala
@@ -42,6 +42,7 @@ private class GameBoardView : Gtk.DrawingArea
         theme_manager.theme_changed.connect (refresh_pixmaps);
 
         init_mouse ();
+        set_draw_func (draw);
         size_allocate.connect (on_size_allocate);
     }
 
@@ -88,7 +89,7 @@ private class GameBoardView : Gtk.DrawingArea
     * * drawing
     \*/
 
-    protected override bool draw (Cairo.Context cr)
+    private inline void draw (Gtk.DrawingArea _this, Cairo.Context cr, int new_width, int new_height)
     {
         /* background */
         cr.save ();
@@ -108,8 +109,6 @@ private class GameBoardView : Gtk.DrawingArea
         cr.translate (board_x, board_y);
         draw_grid (cr);
         cr.restore ();
-
-        return false;
     }
 
     private inline void paint_tile (Cairo.Context cr, uint8 row, uint8 col)
diff --git a/src/history-button.vala b/src/history-button.vala
index 765f7b1..e28bc36 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 (configure_drawing);
-        drawing.draw.connect (update_drawing);
+        drawing.set_draw_func (update_drawing);
         theme_manager.theme_changed.connect (() => {
                 if (!drawing_configured)
                     return;
@@ -105,14 +105,13 @@ private class HistoryButton : MenuButton, AdaptativeWidget
         tileset_pixbuf = (!) tmp_pixbuf;
     }
 
-    private bool update_drawing (Cairo.Context cr)
+    private inline void update_drawing (Gtk.DrawingArea _drawing, Cairo.Context cr, int new_width, int 
new_height)
     {
         if (!drawing_configured)
-            return false;
+            return;
 
         draw_arrow (cr);
         draw_piece (cr);
-        return true;
     }
 
     private const double arrow_margin_top = 3.0;


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]