Fix "Drawing to the wrong window with cairo and X11" (#1358)

This commit is contained in:
ManoloFLTK 2026-01-12 10:00:55 +01:00
parent 07cce04aa1
commit 8f7b72f34b

View File

@ -123,8 +123,6 @@ cairo_t *Fl::cairo_make_current(Fl_Window *wi) {
if (fl_gc == Fl::cairo_state_.gc() && fl_xid(wi) == (Window)Fl::cairo_state_.window())
return Fl::cairo_cc();
cairo_state_.window((void *)fl_xid(wi));
// Scale the Cairo context appropriately. This is platform dependent
#if !defined(USE_MAC_OS)
@ -138,6 +136,8 @@ cairo_t *Fl::cairo_make_current(Fl_Window *wi) {
cairo_ctxt = Fl::cairo_make_current(fl_gc, wi->w(), wi->h());
#endif
cairo_state_.window((void *)fl_xid(wi));
#if !defined(USE_MAC_OS)
cairo_scale(cairo_ctxt, scale, scale);
#endif