Add a GTK4 backend. #20321
Add a GTK4 backend. #20321
Conversation
|
I've now fixed resizing, which was easier to fix than I first thought, so it's just the toolbar button setup that needs fixing. Then there's lots of shared code between 2 and 3 that could be refactored out. |
|
OK, I've fixed the toolbar, as well as tool manager, a focus issue, and this seems to be working in general. I haven't done the refactor or updated CI yet, but it is in a testable state. |
QuLogic
force-pushed the
QuLogic:gtk4
branch
2 times, most recently
from
b09cb0f
to
b3ba921
|
OK, I noticed some more bugs and have fixed them now. The tool manager copy button works now, and save figure uses the native dialog. I moved common code into a separate file. I'm debating whether the canvas and manager should be refactored together. The event handling is quite a bit different, so this may not save much. Really only the draw event handling (with a rubberband) is common on the canvas. IPython does not have an entry for gtk4, so does not set up event loop integration. I don't know if there's anything we can do on our side to get that working. |
QuLogic
force-pushed the
QuLogic:gtk4
branch
3 times, most recently
from
0f0119e
to
fc11e21
QuLogic
force-pushed the
QuLogic:gtk4
branch
2 times, most recently
from
87031fc
to
a06d597
|
Fixed, and I also added docs and example updates. Since we don't need to support GTK 3.0.0, I used the latest recommended style for the embedding examples. |
|
Modulo rebase, CI, and clarifying #20321 (comment). |
| # TODO: Only update the rubberband area. | ||
| self.queue_draw() | ||
|
|
||
| def draw_func(self, drawing_area, ctx, width, height): |
anntzer
Aug 6, 2021
Contributor
Keep this private? (this makes is slightly clearer that 3rd party renderers (i.e., mplcairo.gtk) can keep on overriding on_draw_event as in gtk3, not something else)
Keep this private? (this makes is slightly clearer that 3rd party renderers (i.e., mplcairo.gtk) can keep on overriding on_draw_event as in gtk3, not something else)
|
Actually I found another bug: with this PR, on gtk3 (not gtk4), if you press |
|
Ah, I thought the block wasn't working in GTK4, but it was really just a stylistic issue. Adding the |
|
I can't say I checked everything, but this seems good enough to go for now and we can always fix anything else we find later. |
|
@tacaswell The last commit fixes Ctrl+C, but it needs the IPython input hooks to work completely as expected ipython/ipython#13101 |
|
I @QuLogic can self-merge this after a rebase and CI green. |
According to the docs, this function was added in GTK 2.2, so probably was only needed when we supported GTK2. It also no longer exists in GTK4.
Since these examples don't need to support the very oldest GTK3, I took the opportunity to rewrite them using the recommended Application-styled model.
The `Gtk.Window.destroy` doesn't work, but `.close` correctly triggers our cleanup.
QuLogic
merged commit d3da54a
into
matplotlib:master
…321-on-v3.5.x Backport PR #20321 on branch v3.5.x (Add a GTK4 backend.)
PR Summary
This is currently sufficient to open a window, do the usual things, like handle key presses, or zoom/pan, but there are still some kinks to work out. The zoom/pan buttons do not stay pressed, the canvas does not resize, and there are probably several other smaller things that are broken.
It is also in a separate file, but several of the changes can be cross-ported to the GTK3 backend, which I will do separately. When that is done, I can likely remove a lot of duplication, and possibly put it all together like Qt5/Qt6 is aiming to do.
PR Checklist
pytestpasses).flake8on changed files to check).flake8-docstringsand runflake8 --docstring-convention=all).doc/users/next_whats_new/(follow instructions in README.rst there).doc/api/next_api_changes/(follow instructions in README.rst there).