From f6d2ba651bc22b59488ac4be658f0d725296e2fc Mon Sep 17 00:00:00 2001
From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
Date: Mon, 27 Nov 2023 10:02:59 +0100
Subject: Cairo graphics driver: Improve drawing of Fl_Pixmap and Fl_Bitmap

---
 FL/Fl_Bitmap.H | 2 ++
 FL/Fl_Image.H  | 2 ++
 FL/Fl_Pixmap.H | 2 ++
 3 files changed, 6 insertions(+)

(limited to 'FL')

diff --git a/FL/Fl_Bitmap.H b/FL/Fl_Bitmap.H
index 7fde10f5b..677af7db4 100644
--- a/FL/Fl_Bitmap.H
+++ b/FL/Fl_Bitmap.H
@@ -61,6 +61,8 @@ public:
   void label(Fl_Widget*w) FL_OVERRIDE;
   void label(Fl_Menu_Item*m) FL_OVERRIDE;
   void uncache() FL_OVERRIDE;
+  int cache_w() {return cache_w_;}
+  int cache_h() {return cache_h_;}
 };
 
 #endif
diff --git a/FL/Fl_Image.H b/FL/Fl_Image.H
index eb7aef3c6..a8f514f36 100644
--- a/FL/Fl_Image.H
+++ b/FL/Fl_Image.H
@@ -369,6 +369,8 @@ public:
   void label(Fl_Widget*w) FL_OVERRIDE;
   void label(Fl_Menu_Item*m) FL_OVERRIDE;
   void uncache() FL_OVERRIDE;
+  int cache_w() {return cache_w_;}
+  int cache_h() {return cache_h_;}
   /** Sets the maximum allowed image size in bytes when creating an Fl_RGB_Image object.
 
    The image size in bytes of an Fl_RGB_Image object is the value of the product w() * h() * d().
diff --git a/FL/Fl_Pixmap.H b/FL/Fl_Pixmap.H
index ddf996fba..0efdb84c7 100644
--- a/FL/Fl_Pixmap.H
+++ b/FL/Fl_Pixmap.H
@@ -72,6 +72,8 @@ public:
   void label(Fl_Widget*w) FL_OVERRIDE;
   void label(Fl_Menu_Item*m) FL_OVERRIDE;
   void uncache() FL_OVERRIDE;
+  int cache_w() {return cache_w_;}
+  int cache_h() {return cache_h_;}
 };
 
 #endif
-- 
cgit v1.2.3


From 57371365d8933542ebe7c78651f621e1273733cf Mon Sep 17 00:00:00 2001
From: Albrecht Schlosser <albrechts.fltk@online.de>
Date: Mon, 27 Nov 2023 15:33:53 +0100
Subject: Fix compiler warning, dependencies, and trailing whitespace
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The benign warning was:
  ‘Fl_Browser_::hscrollbar’ will be initialized after [-Wreorder]
  ‘int Fl_Browser_::linespacing_’ ...
---
 FL/Fl_Text_Display.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FL')

diff --git a/FL/Fl_Text_Display.H b/FL/Fl_Text_Display.H
index 2d2d2d565..c736db1e0 100644
--- a/FL/Fl_Text_Display.H
+++ b/FL/Fl_Text_Display.H
@@ -498,7 +498,7 @@ protected:
                    int leftClip, int rightClip) const;
 
   int handle_rmb(int readonly);
-  
+
   void draw_line_numbers(bool clearAll);
 
   void clear_rect(int style, int x, int y, int width, int height) const;
-- 
cgit v1.2.3


From 44b845cc42b9a0326b6aa3438462bcd1b77ddeb4 Mon Sep 17 00:00:00 2001
From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
Date: Wed, 29 Nov 2023 10:03:14 +0100
Subject: Change type of member variables Fl_Graphics_Driver::ascent + descent
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Type short is too small for Fl_Cairo_Graphics_Driver and font sizes ≥ 110.
---
 FL/Fl_Graphics_Driver.H | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'FL')

diff --git a/FL/Fl_Graphics_Driver.H b/FL/Fl_Graphics_Driver.H
index 1d7c3d702..49d6d4fc4 100644
--- a/FL/Fl_Graphics_Driver.H
+++ b/FL/Fl_Graphics_Driver.H
@@ -383,7 +383,7 @@ public:
   Fl_Fontsize size; /**< font size */
   Fl_Font_Descriptor(const char* fontname, Fl_Fontsize size);
   virtual FL_EXPORT ~Fl_Font_Descriptor() {}
-  short ascent, descent;
+  int ascent, descent;
   unsigned int listbase;// base of display list, 0 = none
 };
 
-- 
cgit v1.2.3