superrob1500
/
mirror-ghostty
mirror of https://github.com/ghostty-org/ghostty
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

gtk-ng: only show OSD when mouse event isn't consumed

pull/8224/head
Leah Amelia Chen 2025-08-14 03:16:32 +08:00
parent 23048dbd33
commit 1b1264e592
No known key found for this signature in database
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/apprt/gtk-ng/class/surface.zig
View File

@ -1951,29 +1951,29 @@ pub const Surface = extern struct {
const event = gesture.as(gtk.EventController).getCurrentEvent() orelse return; const event = gesture.as(gtk.EventController).getCurrentEvent() orelse return;
const priv = self.private(); const priv = self.private();
if (priv.core_surface) |surface| { const surface = priv.core_surface orelse return;
const gtk_mods = event.getModifierState(); const gtk_mods = event.getModifierState();
const button = translateMouseButton(gesture.as(gtk.GestureSingle).getCurrentButton()); const button = translateMouseButton(gesture.as(gtk.GestureSingle).getCurrentButton());
// Trigger the on-screen keyboard if we have no selection. const mods = gtk_key.translateMods(gtk_mods);
// const consumed = surface.mouseButtonCallback(
// It's better to do this here rather than in the core callback .release,
// since we have direct access to the underlying gdk.Event here. button,
if (button == .left and !surface.hasSelection()) { mods,
if (!self.showOnScreenKeyboard(event)) { ) catch |err| {
log.warn("failed to activate the on-screen keyboard", .{}); log.warn("error in key callback err={}", .{err});
} return;
};
// Trigger the on-screen keyboard if we have no selection,
// and that the mouse event hasn't been intercepted by the callback.
//
// It's better to do this here rather than within the core callback
// since we have direct access to the underlying gdk.Event here.
if (!consumed and button == .left and !surface.hasSelection()) {
if (!self.showOnScreenKeyboard(event)) {
log.warn("failed to activate the on-screen keyboard", .{});
} }
const mods = gtk_key.translateMods(gtk_mods);
_ = surface.mouseButtonCallback(
.release,
button,
mods,
) catch |err| {
log.warn("error in key callback err={}", .{err});
return;
};
} }
} }