|
|
commit 3225afaeecc1a1f0a54cab6f60be485a0352606c
Author: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
AuthorDate: Tue Sep 27 16:51:35 2022 +0200
Commit: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>
CommitDate: Tue Sep 27 16:51:35 2022 +0200
Remove use of class Fl_Window_Driver inside libfltk_gl
src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.cxx | 2 +-
src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.cxx src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.cxx
index 3f91d0c..2866e02 100644
--- src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.cxx
+++ src/drivers/Wayland/Fl_Wayland_Gl_Window_Driver.cxx
@@ -301,7 +301,7 @@ void Fl_Wayland_Gl_Window_Driver::make_current_before() {
float Fl_Wayland_Gl_Window_Driver::pixels_per_unit()
{
- int ns = Fl_Window_Driver::driver(pWindow)->screen_num();
+ int ns = pWindow->screen_num();
int wld_scale = pWindow->shown() ? fl_wl_xid(pWindow)->scale : 1;
return wld_scale * Fl::screen_driver()->scale(ns);
}
diff --git src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx
index 476d654..90036b9 100644
--- src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx
+++ src/drivers/X11/Fl_X11_Gl_Window_Driver.cxx
@@ -19,7 +19,6 @@
#include <FL/platform.H>
#include "../../Fl_Gl_Choice.H"
#include "../../Fl_Screen_Driver.H"
-#include "../../Fl_Window_Driver.H"
#include "Fl_X11_Gl_Window_Driver.H"
# include <GL/glx.h>
# if ! defined(GLX_VERSION_1_3)
@@ -347,7 +346,7 @@ void Fl_X11_Gl_Window_Driver::before_show(int&) {
float Fl_X11_Gl_Window_Driver::pixels_per_unit()
{
- int ns = Fl_Window_Driver::driver(pWindow)->screen_num();
+ int ns = pWindow->screen_num();
return Fl::screen_driver()->scale(ns);
}
[ Direct Link to Message ] | |
|
| |