NotificationsYou must be signed in to change notification settings
Fork7.9k
Star21.3k

Commite18cfda

committed

FIX: Add version gate to GTK4 calls when necessary

get_current_event() calls within pygobject would cause segfaults. Thiswas fixed in 3.47, so gate the guiEvent information to only accessthat method in versions that don't segfault.

1 parentdc63ec7 commite18cfdaCopy full SHA for e18cfda

File tree

1 file changed

+10

-8

lines changed

lib/matplotlib/backends
- backend_gtk4.py

1 file changed

+10

-8

lines changed

`‎lib/matplotlib/backends/backend_gtk4.py`

Lines changed: 10 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,8 @@`
`29`	`29`	`TimerGTKasTimerGTK4,`
`30`	`30`	`)`
`31`	`31`
	`32`	`+_GOBJECT_GE_3_47=gi.version_info>= (3,47,0)`
	`33`	`+`
`32`	`34`
`33`	`35`	`classFigureCanvasGTK4(_FigureCanvasGTK,Gtk.DrawingArea):`
`34`	`36`	`required_interactive_framework="gtk4"`
`@@ -115,7 +117,7 @@ def scroll_event(self, controller, dx, dy):`
`115`	`117`	`MouseEvent(`
`116`	`118`	`"scroll_event",self,*self._mpl_coords(),step=dy,`
`117`	`119`	`modifiers=self._mpl_modifiers(controller),`
`118`		`-guiEvent=controller.get_current_event(),`
	`120`	`+guiEvent=controller.get_current_event()if_GOBJECT_GE_3_47elseNone,`
`119`	`121`	`)._process()`
`120`	`122`	`returnTrue`
`121`	`123`
`@@ -124,7 +126,7 @@ def button_press_event(self, controller, n_press, x, y):`
`124`	`126`	`"button_press_event",self,*self._mpl_coords((x,y)),`
`125`	`127`	`controller.get_current_button(),`
`126`	`128`	`modifiers=self._mpl_modifiers(controller),`
`127`		`-guiEvent=controller.get_current_event(),`
	`129`	`+guiEvent=controller.get_current_event()if_GOBJECT_GE_3_47elseNone,`
`128`	`130`	`)._process()`
`129`	`131`	`self.grab_focus()`
`130`	`132`
`@@ -133,22 +135,22 @@ def button_release_event(self, controller, n_press, x, y):`
`133`	`135`	`"button_release_event",self,*self._mpl_coords((x,y)),`
`134`	`136`	`controller.get_current_button(),`
`135`	`137`	`modifiers=self._mpl_modifiers(controller),`
`136`		`-guiEvent=controller.get_current_event(),`
	`138`	`+guiEvent=controller.get_current_event()if_GOBJECT_GE_3_47elseNone,`
`137`	`139`	`)._process()`
`138`	`140`
`139`	`141`	`defkey_press_event(self,controller,keyval,keycode,state):`
`140`	`142`	`KeyEvent(`
`141`	`143`	`"key_press_event",self,self._get_key(keyval,keycode,state),`
`142`	`144`	`*self._mpl_coords(),`
`143`		`-guiEvent=controller.get_current_event(),`
	`145`	`+guiEvent=controller.get_current_event()if_GOBJECT_GE_3_47elseNone,`
`144`	`146`	`)._process()`
`145`	`147`	`returnTrue`
`146`	`148`
`147`	`149`	`defkey_release_event(self,controller,keyval,keycode,state):`
`148`	`150`	`KeyEvent(`
`149`	`151`	`"key_release_event",self,self._get_key(keyval,keycode,state),`
`150`	`152`	`*self._mpl_coords(),`
`151`		`-guiEvent=controller.get_current_event(),`
	`153`	`+guiEvent=controller.get_current_event()if_GOBJECT_GE_3_47elseNone,`
`152`	`154`	`)._process()`
`153`	`155`	`returnTrue`
`154`	`156`
`@@ -157,21 +159,21 @@ def motion_notify_event(self, controller, x, y):`
`157`	`159`	`"motion_notify_event",self,*self._mpl_coords((x,y)),`
`158`	`160`	`buttons=self._mpl_buttons(controller),`
`159`	`161`	`modifiers=self._mpl_modifiers(controller),`
`160`		`-guiEvent=controller.get_current_event(),`
	`162`	`+guiEvent=controller.get_current_event()if_GOBJECT_GE_3_47elseNone,`
`161`	`163`	`)._process()`
`162`	`164`
`163`	`165`	`defenter_notify_event(self,controller,x,y):`
`164`	`166`	`LocationEvent(`
`165`	`167`	`"figure_enter_event",self,*self._mpl_coords((x,y)),`
`166`	`168`	`modifiers=self._mpl_modifiers(),`
`167`		`-guiEvent=controller.get_current_event(),`
	`169`	`+guiEvent=controller.get_current_event()if_GOBJECT_GE_3_47elseNone,`
`168`	`170`	`)._process()`
`169`	`171`
`170`	`172`	`defleave_notify_event(self,controller):`
`171`	`173`	`LocationEvent(`
`172`	`174`	`"figure_leave_event",self,*self._mpl_coords(),`
`173`	`175`	`modifiers=self._mpl_modifiers(),`
`174`		`-guiEvent=controller.get_current_event(),`
	`176`	`+guiEvent=controller.get_current_event()if_GOBJECT_GE_3_47elseNone,`
`175`	`177`	`)._process()`
`176`	`178`
`177`	`179`	`defresize_event(self,area,width,height):`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commite18cfda

File tree

1 file changed

1 file changed

`‎lib/matplotlib/backends/backend_gtk4.py`

0 commit comments