From 7483651aaa980e0479d512aac1e77e6cddb7fc0d Mon Sep 17 00:00:00 2001
From: Manolo Gouy <Manolo>
Date: Sat, 30 Jun 2018 05:57:21 +0000
Subject: Avoid giving same name (s) to 2 variables.

git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12988 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
---
 src/Fl_cocoa.mm | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index 95788ac98..f61834d6a 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -2147,11 +2147,11 @@ static FLTextInputContext* fltextinputcontext_instance = nil;
   fl_lock_function();
   FLWindow *cw = (FLWindow*)[self window];
   Fl_Window *window = [cw getFl_Window];
-  float s = fl_graphics_driver->scale();
-  if ( !window->parent() && window->border() && fabs(rect.size.height - window->h() * s) > 5. ) { // this happens with tabbed windows
-        window->resize([cw frame].origin.x/s,
-                       (main_screen_height - ([cw frame].origin.y + rect.size.height))/s,
-                       rect.size.width/s, rect.size.height/s);
+  float scale = fl_graphics_driver->scale();
+  if ( !window->parent() && window->border() && fabs(rect.size.height - window->h() * scale) > 5. ) { // this happens with tabbed windows
+        window->resize([cw frame].origin.x/scale,
+                       (main_screen_height - ([cw frame].origin.y + rect.size.height))/scale,
+                       rect.size.width/scale, rect.size.height/scale);
   }
   through_drawRect = YES;
   Fl_Cocoa_Window_Driver *d = Fl_Cocoa_Window_Driver::driver(window);
-- 
cgit v1.2.3