Commit06269cd

authored

Merge pull request#27990 from meeseeksmachine/auto-backport-of-pr-27988-on-v3.8.x

Backport PR#27988 on branch v3.8.x (gtk: Ensure pending draws are done before GTK draw)

2 parents473b407 +0fb44b5 commit06269cdCopy full SHA for 06269cd

File tree

+24

-4

lines changed

+24

-4

lines changed

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`from ..importcbook,transforms`
`4`	`4`	`from .importbackend_agg,backend_gtk3`
`5`		`-from .backend_gtk3importGtk,_BackendGTK3`
	`5`	`+from .backend_gtk3importGLib,Gtk,_BackendGTK3`
`6`	`6`
`7`	`7`	`importcairo# Presence of cairo is already checked by _backend_gtk.`
`8`	`8`
`@@ -14,6 +14,11 @@ def __init__(self, figure):`
`14`	`14`	`self._bbox_queue= []`
`15`	`15`
`16`	`16`	`defon_draw_event(self,widget,ctx):`
	`17`	`+ifself._idle_draw_id:`
	`18`	`+GLib.source_remove(self._idle_draw_id)`
	`19`	`+self._idle_draw_id=0`
	`20`	`+self.draw()`
	`21`	`+`
`17`	`22`	`scale=self.device_pixel_ratio`
`18`	`23`	`allocation=self.get_allocation()`
`19`	`24`	`w=allocation.width*scale`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,16 @@`
`1`	`1`	`fromcontextlibimportnullcontext`
`2`	`2`
`3`	`3`	`from .backend_cairoimportFigureCanvasCairo`
`4`		`-from .backend_gtk3importGtk,FigureCanvasGTK3,_BackendGTK3`
	`4`	`+from .backend_gtk3importGLib,Gtk,FigureCanvasGTK3,_BackendGTK3`
`5`	`5`
`6`	`6`
`7`	`7`	`classFigureCanvasGTK3Cairo(FigureCanvasCairo,FigureCanvasGTK3):`
`8`	`8`	`defon_draw_event(self,widget,ctx):`
	`9`	`+ifself._idle_draw_id:`
	`10`	`+GLib.source_remove(self._idle_draw_id)`
	`11`	`+self._idle_draw_id=0`
	`12`	`+self.draw()`
	`13`	`+`
`9`	`14`	`with (self.toolbar._wait_cursor_for_draw_cm()ifself.toolbar`
`10`	`15`	`elsenullcontext()):`
`11`	`16`	`self._renderer.set_context(ctx)`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`from ..importcbook`
`4`	`4`	`from .importbackend_agg,backend_gtk4`
`5`		`-from .backend_gtk4importGtk,_BackendGTK4`
	`5`	`+from .backend_gtk4importGLib,Gtk,_BackendGTK4`
`6`	`6`
`7`	`7`	`importcairo# Presence of cairo is already checked by _backend_gtk.`
`8`	`8`
`@@ -11,6 +11,11 @@ class FigureCanvasGTK4Agg(backend_agg.FigureCanvasAgg,`
`11`	`11`	`backend_gtk4.FigureCanvasGTK4):`
`12`	`12`
`13`	`13`	`defon_draw_event(self,widget,ctx):`
	`14`	`+ifself._idle_draw_id:`
	`15`	`+GLib.source_remove(self._idle_draw_id)`
	`16`	`+self._idle_draw_id=0`
	`17`	`+self.draw()`
	`18`	`+`
`14`	`19`	`scale=self.device_pixel_ratio`
`15`	`20`	`allocation=self.get_allocation()`
`16`	`21`

Lines changed: 6 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,18 @@`
`1`	`1`	`fromcontextlibimportnullcontext`
`2`	`2`
`3`	`3`	`from .backend_cairoimportFigureCanvasCairo`
`4`		`-from .backend_gtk4importGtk,FigureCanvasGTK4,_BackendGTK4`
	`4`	`+from .backend_gtk4importGLib,Gtk,FigureCanvasGTK4,_BackendGTK4`
`5`	`5`
`6`	`6`
`7`	`7`	`classFigureCanvasGTK4Cairo(FigureCanvasCairo,FigureCanvasGTK4):`
`8`	`8`	`_context_is_scaled=True`
`9`	`9`
`10`	`10`	`defon_draw_event(self,widget,ctx):`
	`11`	`+ifself._idle_draw_id:`
	`12`	`+GLib.source_remove(self._idle_draw_id)`
	`13`	`+self._idle_draw_id=0`
	`14`	`+self.draw()`
	`15`	`+`
`11`	`16`	`with (self.toolbar._wait_cursor_for_draw_cm()ifself.toolbar`
`12`	`17`	`elsenullcontext()):`
`13`	`18`	`self._renderer.set_context(ctx)`

Comments

(0)