Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-08-02 14:57:31 +03:00
Code Issues Packages Projects Releases Wiki Activity

gtk: blur the content view instead of using a Revealer widget

Browse Source
This commit is contained in:
Maciej Bartczak
2025-03-02 21:07:19 +01:00
parent 1f695c2646
commit 7123d4e055
5 changed files with 84 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/apprt/gtk/ClipboardConfirmationWindow.zig
View File

@ -25,7 +25,8 @@ dialog: *DialogType,
data: [:0]u8, data: [:0]u8,
core_surface: *CoreSurface, core_surface: *CoreSurface,
pending_req: apprt.ClipboardRequest, pending_req: apprt.ClipboardRequest,
content_revealer: *gtk.Revealer, text_view: *gtk.TextView,
text_view_scroll: *gtk.ScrolledWindow,
reveal_button_widget: *gtk.Widget, reveal_button_widget: *gtk.Widget,
hide_button_widget: *gtk.Widget, hide_button_widget: *gtk.Widget,
@ -85,9 +86,10 @@ fn init(
defer builder.deinit(); defer builder.deinit();
const dialog = builder.getObject(DialogType, "clipboard_confirmation_window").?; const dialog = builder.getObject(DialogType, "clipboard_confirmation_window").?;
const content_revealer = builder.getObject(gtk.Revealer, "content_revealer").?; const text_view = builder.getObject(gtk.TextView, "text_view").?;
const reveal_button: *gtk.Button = builder.getObject(gtk.Button, "reveal_button").?; const reveal_button = builder.getObject(gtk.Button, "reveal_button").?;
const hide_button: *gtk.Button = builder.getObject(gtk.Button, "hide_button").?; const hide_button = builder.getObject(gtk.Button, "hide_button").?;
const text_view_scroll = builder.getObject(gtk.ScrolledWindow, "text_view_scroll").?;
const copy = try app.core_app.alloc.dupeZ(u8, data); const copy = try app.core_app.alloc.dupeZ(u8, data);
errdefer app.core_app.alloc.free(copy); errdefer app.core_app.alloc.free(copy);
@ -97,22 +99,37 @@ fn init(
.data = copy, .data = copy,
.core_surface = core_surface, .core_surface = core_surface,
.pending_req = request, .pending_req = request,
.content_revealer = content_revealer, .text_view = text_view,
.text_view_scroll = text_view_scroll,
.reveal_button_widget = gobject.ext.cast(gtk.Widget, reveal_button).?, .reveal_button_widget = gobject.ext.cast(gtk.Widget, reveal_button).?,
.hide_button_widget = gobject.ext.cast(gtk.Widget, hide_button).?, .hide_button_widget = gobject.ext.cast(gtk.Widget, hide_button).?,
}; };
const text_view = builder.getObject(gtk.TextView, "text_view").?;
const buffer = gtk.TextBuffer.new(null); const buffer = gtk.TextBuffer.new(null);
errdefer buffer.unref(); errdefer buffer.unref();
buffer.insertAtCursor(copy.ptr, @intCast(copy.len)); buffer.insertAtCursor(copy.ptr, @intCast(copy.len));
text_view.setBuffer(buffer); text_view.setBuffer(buffer);
if (is_secure_input) { if (is_secure_input) {
content_revealer.setRevealChild(@intFromBool(false)); gobject.ext.as(gtk.Widget, text_view_scroll).setSensitive(@intFromBool(false));
gobject.ext.as(gtk.Widget, self.text_view).addCssClass("blurred");
self.reveal_button_widget.setVisible(@intFromBool(true)); self.reveal_button_widget.setVisible(@intFromBool(true));
_ = gtk.Button.signals.clicked.connect(reveal_button, *ClipboardConfirmation, gtkRevealButtonClicked, self, .{});
_ = gtk.Button.signals.clicked.connect(hide_button, *ClipboardConfirmation, gtkHideButtonClicked, self, .{}); _ = gtk.Button.signals.clicked.connect(
reveal_button,
*ClipboardConfirmation,
gtkRevealButtonClicked,
self,
.{},
);
_ = gtk.Button.signals.clicked.connect(
hide_button,
*ClipboardConfirmation,
gtkHideButtonClicked,
self,
.{},
);
} }
switch (DialogType) { switch (DialogType) {
@ -172,13 +189,17 @@ fn gtkResponse(_: *DialogType, response: [*:0]u8, self: *ClipboardConfirmation)
} }
fn gtkRevealButtonClicked(_: *gtk.Button, self: *ClipboardConfirmation) callconv(.C) void { fn gtkRevealButtonClicked(_: *gtk.Button, self: *ClipboardConfirmation) callconv(.C) void {
self.content_revealer.setRevealChild(@intFromBool(true)); gobject.ext.as(gtk.Widget, self.text_view_scroll).setSensitive(@intFromBool(true));
gobject.ext.as(gtk.Widget, self.text_view).removeCssClass("blurred");
self.hide_button_widget.setVisible(@intFromBool(true)); self.hide_button_widget.setVisible(@intFromBool(true));
self.reveal_button_widget.setVisible(@intFromBool(false)); self.reveal_button_widget.setVisible(@intFromBool(false));
} }
fn gtkHideButtonClicked(_: *gtk.Button, self: *ClipboardConfirmation) callconv(.C) void { fn gtkHideButtonClicked(_: *gtk.Button, self: *ClipboardConfirmation) callconv(.C) void {
self.content_revealer.setRevealChild(@intFromBool(false)); gobject.ext.as(gtk.Widget, self.text_view_scroll).setSensitive(@intFromBool(false));
gobject.ext.as(gtk.Widget, self.text_view).addCssClass("blurred");
self.hide_button_widget.setVisible(@intFromBool(false)); self.hide_button_widget.setVisible(@intFromBool(false));
self.reveal_button_widget.setVisible(@intFromBool(true)); self.reveal_button_widget.setVisible(@intFromBool(true));
} }

10
src/apprt/gtk/style.css
View File

@ -63,3 +63,13 @@ window.ssd.no-border-radius {
margin: 0; margin: 0;
padding: 0; padding: 0;
} }
.clipboard-content-view {
filter: blur(0px);
transition: filter 0.3s ease;
}
.clipboard-content-view.blurred {
filter: blur(5px);
transition: filter 0.3s ease;
}

29
src/apprt/gtk/ui/1.5/ccw-osc-52-read.blp
View File

@ -36,23 +36,22 @@ Adw.AlertDialog clipboard_confirmation_window {
label: _("Hide Potentially Sensitive Content"); label: _("Hide Potentially Sensitive Content");
} }
Revealer content_revealer { ScrolledWindow text_view_scroll {
reveal-child: true; width-request: 500;
transition-type: slide_down; height-request: 250;
ScrolledWindow { TextView text_view {
width-request: 500; cursor-visible: false;
height-request: 250; editable: false;
monospace: true;
top-margin: 8;
left-margin: 8;
bottom-margin: 8;
right-margin: 8;
TextView text_view { styles [
cursor-visible: false; "clipboard-content-view"
editable: false; ]
monospace: true;
top-margin: 8;
left-margin: 8;
bottom-margin: 8;
right-margin: 8;
}
} }
} }
}; };

29
src/apprt/gtk/ui/1.5/ccw-osc-52-write.blp
View File

@ -36,23 +36,22 @@ Adw.AlertDialog clipboard_confirmation_window {
label: _("Hide Potentially Sensitive Content"); label: _("Hide Potentially Sensitive Content");
} }
Revealer content_revealer { ScrolledWindow text_view_scroll {
reveal-child: true; width-request: 500;
transition-type: slide_down; height-request: 250;
ScrolledWindow { TextView text_view {
width-request: 500; cursor-visible: false;
height-request: 250; editable: false;
monospace: true;
top-margin: 8;
left-margin: 8;
bottom-margin: 8;
right-margin: 8;
TextView text_view { styles [
cursor-visible: false; "clipboard-content-view"
editable: false; ]
monospace: true;
top-margin: 8;
left-margin: 8;
bottom-margin: 8;
right-margin: 8;
}
} }
} }
}; };

29
src/apprt/gtk/ui/1.5/ccw-paste.blp
View File

@ -36,23 +36,22 @@ Adw.AlertDialog clipboard_confirmation_window {
label: _("Hide Potentially Sensitive Content"); label: _("Hide Potentially Sensitive Content");
} }
Revealer content_revealer { ScrolledWindow text_view_scroll {
reveal-child: true; width-request: 500;
transition-type: slide_down; height-request: 250;
ScrolledWindow { TextView text_view {
width-request: 500; cursor-visible: false;
height-request: 250; editable: false;
monospace: true;
top-margin: 8;
left-margin: 8;
bottom-margin: 8;
right-margin: 8;
TextView text_view { styles [
cursor-visible: false; "clipboard-content-view"
editable: false; ]
monospace: true;
top-margin: 8;
left-margin: 8;
bottom-margin: 8;
right-margin: 8;
}
} }
} }
}; };