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/Fl_Graphics_Driver.cxx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/Fl_Graphics_Driver.cxx')

diff --git a/src/Fl_Graphics_Driver.cxx b/src/Fl_Graphics_Driver.cxx
index 00eaf5a15..43e754130 100644
--- a/src/Fl_Graphics_Driver.cxx
+++ b/src/Fl_Graphics_Driver.cxx
@@ -626,7 +626,7 @@ void Fl_Graphics_Driver::overlay_rect(int x, int y, int w , int h) {
   loop(x, y, x+w-1, y, x+w-1, y+h-1, x, y+h-1);
 }
 
-float Fl_Graphics_Driver::remove_scale() { return 1.f;}
+float Fl_Graphics_Driver::override_scale() { return scale();}
 
 void Fl_Graphics_Driver::restore_scale(float) { }
 
@@ -979,7 +979,7 @@ void Fl_Scalable_Graphics_Driver::draw_image_mono_unscaled(Fl_Draw_Image_Cb cb,
 
 void Fl_Scalable_Graphics_Driver::transformed_vertex0(float x, float y) {}
 
-float Fl_Scalable_Graphics_Driver::remove_scale() {
+float Fl_Scalable_Graphics_Driver::override_scale() {
   float s = scale();
   if (s != 1.f) {
     push_no_clip();
-- 
cgit v1.2.3