diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Gl_Window.cxx | 4 | ||||
| -rw-r--r-- | src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx | 2 | ||||
| -rw-r--r-- | src/glut_compatability.cxx | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/Fl_Gl_Window.cxx b/src/Fl_Gl_Window.cxx index 7e4693acd..72468fd5c 100644 --- a/src/Fl_Gl_Window.cxx +++ b/src/Fl_Gl_Window.cxx @@ -404,7 +404,7 @@ int Fl_Gl_Window::gl_plugin_linkage() { Fl::event_y() to the pixel units used by the OpenGL source code. \version 1.3.4 */ -int Fl_Gl_Window::pixels_per_unit() { +float Fl_Gl_Window::pixels_per_unit() { return pGlWindowDriver->pixels_per_unit(); } @@ -470,7 +470,7 @@ void Fl_Cocoa_Gl_Window_Driver::after_show(int need_redraw) { if(need_redraw) pWindow->redraw();//necessary only after creation of a top-level GL window } -int Fl_Cocoa_Gl_Window_Driver::pixels_per_unit() +float Fl_Cocoa_Gl_Window_Driver::pixels_per_unit() { return (fl_mac_os_version >= 100700 && Fl::use_high_res_GL() && Fl_X::i(pWindow) && Fl_Cocoa_Window_Driver::driver(pWindow)->mapped_to_retina()) ? 2 : 1; diff --git a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx index 72fdcd64e..8b216d1ce 100644 --- a/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx +++ b/src/drivers/OpenGL/Fl_OpenGL_Display_Device.cxx @@ -63,7 +63,7 @@ static uchar *convert_BGRA_to_RGB(uchar *baseAddress, int w, int h, int mByteWid Fl_RGB_Image* Fl_OpenGL_Display_Device::capture_gl_rectangle(Fl_Gl_Window* glw, int x, int y, int w, int h) { - int factor = glw->pixels_per_unit(); + float factor = glw->pixels_per_unit(); if (factor > 1) { w *= factor; h *= factor; x *= factor; y *= factor; } diff --git a/src/glut_compatability.cxx b/src/glut_compatability.cxx index 6a024d321..13e06242a 100644 --- a/src/glut_compatability.cxx +++ b/src/glut_compatability.cxx @@ -74,9 +74,9 @@ int Fl_Glut_Window::handle(int event) { make_current(); int ex = Fl::event_x(); int ey = Fl::event_y(); - int factor = pixels_per_unit(); - ex *= factor; - ey *= factor; + float factor = pixels_per_unit(); + ex = int(ex * factor + 0.5f); + ey = int(ey * factor + 0.5f); int button; switch (event) { |
