Daniel Brötzmann pushed to branch newcontrol at gajim / gajim
Commits:
cdc45c5f by wurstsalat at 2022-07-23T20:05:41+02:00
Hotkeys: Cleanup
- - - - -
84e06821 by wurstsalat at 2022-07-23T20:21:47+02:00
MessageInputTextView: Clear undo list when clearing input
- - - - -
3 changed files:
- gajim/gtk/controls/base.py
- gajim/gtk/message_actions_box.py
- gajim/gtk/message_input.py
Changes:
=====================================
gajim/gtk/controls/base.py
=====================================
@@ -273,15 +273,15 @@ def _on_conversation_view_key_press(self,
# if textview.get_buffer().props.has_selection:
# return Gdk.EVENT_PROPAGATE
- if not self.msg_textview.get_sensitive():
- # If the input textview is not sensitive it can’t get the focus.
- # In that case propagate_key_event() would send the event again
- # to the conversation textview. This would mean a recursion.
- return Gdk.EVENT_PROPAGATE
-
- # Focus the Message Input and resend the event
- self.msg_textview.grab_focus()
- self.msg_textview.get_toplevel().propagate_key_event(event)
+ # if not self.msg_textview.get_sensitive():
+ # # If the input textview is not sensitive it can’t get the focus.
+ # # In that case propagate_key_event() would send the event again
+ # # to the conversation textview. This would mean a recursion.
+ # return Gdk.EVENT_PROPAGATE
+
+ # # Focus the Message Input and resend the event
+ # self.msg_textview.grab_focus()
+ # self.msg_textview.get_toplevel().propagate_key_event(event)
return Gdk.EVENT_STOP
@property
=====================================
gajim/gtk/message_actions_box.py
=====================================
@@ -537,7 +537,6 @@ def _on_msg_textview_key_press_event(self,
self.space_pressed = False
event_state = event.get_state()
- # Ctrl [+ Shift] + Tab are not forwarded to notebook. We handle it here
if event_state & Gdk.ModifierType.SHIFT_MASK:
if event_state & Gdk.ModifierType.CONTROL_MASK:
if event.keyval == Gdk.KEY_ISO_Left_Tab:
@@ -546,8 +545,10 @@ def _on_msg_textview_key_press_event(self,
return True
if event.keyval in (Gdk.KEY_Page_Down, Gdk.KEY_Page_Up):
- self.conversation_view.event(event)
- return True
+ control = app.window.get_active_control()
+ if control is not None:
+ control.conversation_view.event(event)
+ return True
if event_state & Gdk.ModifierType.CONTROL_MASK:
if event.keyval == Gdk.KEY_Tab:
=====================================
gajim/gtk/message_input.py
=====================================
@@ -323,6 +323,7 @@ def clear(self, *args: Any) -> None:
buf = self.get_buffer()
start, end = buf.get_bounds()
buf.delete(start, end)
+ self._undo_list.clear()
def save_undo(self, text: str) -> None:
self._undo_list.append(text)
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/b975ba28537d9ccb1f25d2c44b7ab53b0c850028...84e0682142a53960d8a88372f212b095b7d80469
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/b975ba28537d9ccb1f25d2c44b7ab53b0c850028...84e0682142a53960d8a88372f212b095b7d80469
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
