From eb9dd202b212dd0f4c41e0a2b0fabc8a4e51566e Mon Sep 17 00:00:00 2001 From: ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> Date: Mon, 20 Nov 2023 10:56:36 +0100 Subject: [PATCH] Fix Fl_Wayland_Image_Surface_Driver c'tor --- src/drivers/Wayland/Fl_Wayland_Image_Surface_Driver.cxx | 1 + src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx | 1 - src/drivers/Wayland/fl_wayland_clipboard_dnd.cxx | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/drivers/Wayland/Fl_Wayland_Image_Surface_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Image_Surface_Driver.cxx index 5cac257ef..83419e5b2 100644 --- a/src/drivers/Wayland/Fl_Wayland_Image_Surface_Driver.cxx +++ b/src/drivers/Wayland/Fl_Wayland_Image_Surface_Driver.cxx @@ -43,6 +43,7 @@ Fl_Wayland_Image_Surface_Driver::Fl_Wayland_Image_Surface_Driver(int w, int h, cairo_format_stride_for_width(CAIRO_FORMAT_RGB24, w), CAIRO_FORMAT_RGB24); offscreen = (Fl_Offscreen)off_->cairo_; cairo_set_user_data(off_->cairo_, &Fl_Wayland_Graphics_Driver::key, off_, NULL); + if (d*s != 1 && high_res) cairo_scale((cairo_t*)offscreen, d*s, d*s); } driver(new Fl_Wayland_Graphics_Driver()); if (d*s != 1 && high_res) driver()->scale(d*s); diff --git a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx index bc4060930..0b228d83a 100644 --- a/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx +++ b/src/drivers/Wayland/Fl_Wayland_Window_Driver.cxx @@ -18,7 +18,6 @@ #include "Fl_Wayland_Window_Driver.H" #include "Fl_Wayland_Screen_Driver.H" #include "Fl_Wayland_Graphics_Driver.H" -#include "Fl_Wayland_Image_Surface_Driver.H" #include #include #include "../../../libdecor/src/libdecor.h" diff --git a/src/drivers/Wayland/fl_wayland_clipboard_dnd.cxx b/src/drivers/Wayland/fl_wayland_clipboard_dnd.cxx index 973746f7c..bf9194caf 100644 --- a/src/drivers/Wayland/fl_wayland_clipboard_dnd.cxx +++ b/src/drivers/Wayland/fl_wayland_clipboard_dnd.cxx @@ -23,7 +23,6 @@ # include # include "Fl_Wayland_Screen_Driver.H" # include "Fl_Wayland_Window_Driver.H" -# include "Fl_Wayland_Image_Surface_Driver.H" # include "../Unix/Fl_Unix_System_Driver.H" # include "Fl_Wayland_Graphics_Driver.H" # include "../../flstring.h" // includes