Commitc43313a

authored and

committed

Backport PR#28451: Fix GTK cairo backends

1 parent560fdc4 commitc43313aCopy full SHA for c43313a

File tree

+16

-19

lines changed

+16

-19

lines changed

Lines changed: 10 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,15 +13,19 @@ def on_draw_event(self, widget, ctx):`
`13`	`13`
`14`	`14`	`with (self.toolbar._wait_cursor_for_draw_cm()ifself.toolbar`
`15`	`15`	`elsenullcontext()):`
`16`		`-self._renderer.set_context(ctx)`
`17`		`-scale=self.device_pixel_ratio`
`18`		`-# Scale physical drawing to logical size.`
`19`		`-ctx.scale(1/scale,1/scale)`
`20`	`16`	`allocation=self.get_allocation()`
	`17`	`+# Render the background before scaling, as the allocated size here is in`
	`18`	`+# logical pixels.`
`21`	`19`	`Gtk.render_background(`
`22`	`20`	`self.get_style_context(),ctx,`
`23`		`-allocation.x,allocation.y,`
`24`		`-allocation.width,allocation.height)`
	`21`	`+0,0,allocation.width,allocation.height)`
	`22`	`+scale=self.device_pixel_ratio`
	`23`	`+# Scale physical drawing to logical size.`
	`24`	`+ctx.scale(1/scale,1/scale)`
	`25`	`+self._renderer.set_context(ctx)`
	`26`	`+# Set renderer to physical size so it renders in full resolution.`
	`27`	`+self._renderer.width=allocation.width*scale`
	`28`	`+self._renderer.height=allocation.height*scale`
`25`	`29`	`self._renderer.dpi=self.figure.dpi`
`26`	`30`	`self.figure.draw(self._renderer)`
`27`	`31`

Lines changed: 2 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ class FigureCanvasGTK4(_FigureCanvasGTK, Gtk.DrawingArea):`
`34`	`34`	`required_interactive_framework="gtk4"`
`35`	`35`	`supports_blit=False`
`36`	`36`	`manager_class=_api.classproperty(lambdacls:FigureManagerGTK4)`
`37`		`-_context_is_scaled=False`
`38`	`37`
`39`	`38`	`def__init__(self,figure=None):`
`40`	`39`	`super().__init__(figure=figure)`
`@@ -228,13 +227,8 @@ def _post_draw(self, widget, ctx):`
`228`	`227`
`229`	`228`	`lw=1`
`230`	`229`	`dash=3`
`231`		`-ifnotself._context_is_scaled:`
`232`		`-x0,y0,w,h= (dim/self.device_pixel_ratio`
`233`		`-fordiminself._rubberband_rect)`
`234`		`-else:`
`235`		`-x0,y0,w,h=self._rubberband_rect`
`236`		`-lw*=self.device_pixel_ratio`
`237`		`-dash*=self.device_pixel_ratio`
	`230`	`+x0,y0,w,h= (dim/self.device_pixel_ratio`
	`231`	`+fordiminself._rubberband_rect)`
`238`	`232`	`x1=x0+w`
`239`	`233`	`y1=y0+h`
`240`	`234`

Lines changed: 4 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,10 @@`
`5`	`5`
`6`	`6`
`7`	`7`	`classFigureCanvasGTK4Cairo(FigureCanvasCairo,FigureCanvasGTK4):`
`8`		`-_context_is_scaled=True`
	`8`	`+def_set_device_pixel_ratio(self,ratio):`
	`9`	`+# Cairo in GTK4 always uses logical pixels, so we don't need to do anything for`
	`10`	`+# changes to the device pixel ratio.`
	`11`	`+returnFalse`
`9`	`12`
`10`	`13`	`defon_draw_event(self,widget,ctx):`
`11`	`14`	`ifself._idle_draw_id:`
`@@ -16,15 +19,11 @@ def on_draw_event(self, widget, ctx):`
`16`	`19`	`with (self.toolbar._wait_cursor_for_draw_cm()ifself.toolbar`
`17`	`20`	`elsenullcontext()):`
`18`	`21`	`self._renderer.set_context(ctx)`
`19`		`-scale=self.device_pixel_ratio`
`20`		`-# Scale physical drawing to logical size.`
`21`		`-ctx.scale(1/scale,1/scale)`
`22`	`22`	`allocation=self.get_allocation()`
`23`	`23`	`Gtk.render_background(`
`24`	`24`	`self.get_style_context(),ctx,`
`25`	`25`	`allocation.x,allocation.y,`
`26`	`26`	`allocation.width,allocation.height)`
`27`		`-self._renderer.dpi=self.figure.dpi`
`28`	`27`	`self.figure.draw(self._renderer)`
`29`	`28`
`30`	`29`

Comments

(0)