From 88a3f7b7be1110e0d4a8587e48f4ad24fe527646 Mon Sep 17 00:00:00 2001
From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
Date: Sat, 27 Feb 2021 08:18:01 +0100
Subject: Rename fl_remove_scale() to fl_override_scale() as discussed in
 fltk.general

Re: Can custom box type functions handle their own high-DPI screen scaling?
---
 src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H   | 2 +-
 src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/drivers')

diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H
index 7e4aab962..d9051ecbd 100644
--- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.H
@@ -188,7 +188,7 @@ protected:
   void descriptor_init(const char* name, Fl_Fontsize Size, Fl_Quartz_Font_Descriptor *d);
 #endif
   virtual void overlay_rect(int x, int y, int w , int h);
-  virtual float remove_scale();
+  virtual float override_scale();
   virtual void restore_scale(float);
 };
 
diff --git a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx
index acabf6e73..ab95ce510 100644
--- a/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx
+++ b/src/drivers/Quartz/Fl_Quartz_Graphics_Driver.cxx
@@ -160,7 +160,7 @@ void Fl_Quartz_Graphics_Driver::cache_size(Fl_Image *img, int &width, int &heigh
   height *= 2 * scale();
 }
 
-float Fl_Quartz_Graphics_Driver::remove_scale() {
+float Fl_Quartz_Graphics_Driver::override_scale() {
   float s = scale();
   if (s != 1.f && Fl_Display_Device::display_device()->is_current()) {
     Fl::screen_driver()->scale(0, 1.f);
-- 
cgit v1.2.3