anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Forward KeyEvent (and change focus) on key press in conversation view (not chat input)

Browse source 
fixes #28
fixes #513
This commit is contained in:
fiaxh 2019-04-15 17:29:18 +02:00
parent 76c7dec75f
commit ca9b00d5e8
2 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main/src/ui/chat_input/view.vala
View file

@ -26,7 +26,7 @@ public class View : Box {
[GtkChild] private Frame frame; [GtkChild] private Frame frame;
[GtkChild] private ScrolledWindow scrolled; [GtkChild] private ScrolledWindow scrolled;
[GtkChild] private TextView text_input; [GtkChild] public TextView text_input;
[GtkChild] private Box outer_box; [GtkChild] private Box outer_box;
[GtkChild] private Button file_button; [GtkChild] private Button file_button;
[GtkChild] private Separator file_separator; [GtkChild] private Separator file_separator;

14
main/src/ui/unified_window.vala
View file

@ -72,6 +72,20 @@ public class UnifiedWindow : Gtk.Window {
box.add(paned); box.add(paned);
chat_input = ((ChatInput.View) builder.get_object("chat_input")).init(stream_interactor); chat_input = ((ChatInput.View) builder.get_object("chat_input")).init(stream_interactor);
conversation_frame = ((ConversationSummary.ConversationView) builder.get_object("conversation_frame")).init(stream_interactor); conversation_frame = ((ConversationSummary.ConversationView) builder.get_object("conversation_frame")).init(stream_interactor);
conversation_frame.key_press_event.connect((event) => {
// Don't forward / change focus on Control / Alt
if (event.keyval == Gdk.Key.Control_L || event.keyval == Gdk.Key.Control_R ||
event.keyval == Gdk.Key.Alt_L || event.keyval == Gdk.Key.Alt_R) {
return false;
}
// Don't forward / change focus on Control + ...
if ((event.state & ModifierType.CONTROL_MASK) > 0) {
return false;
}
chat_input.text_input.key_press_event(event);
chat_input.text_input.grab_focus();
return true;
});
conversation_selector = ((ConversationSelector) builder.get_object("conversation_list")).init(stream_interactor); conversation_selector = ((ConversationSelector) builder.get_object("conversation_list")).init(stream_interactor);
goto_end_revealer = (Revealer) builder.get_object("goto_end_revealer"); goto_end_revealer = (Revealer) builder.get_object("goto_end_revealer");
goto_end_button = (Button) builder.get_object("goto_end_button"); goto_end_button = (Button) builder.get_object("goto_end_button");