Fixed some modals to be base window input blocking

This commit is contained in:
itdominator 2021-12-18 01:44:54 -06:00
parent 9f3463dc4d
commit 3e1966c17d
3 changed files with 15 additions and 2 deletions

View File

@ -110,6 +110,9 @@ class ShowHideMixin:
def show_edit_file_menu(self, widget=None, eve=None):
if widget:
widget.grab_focus()
response = self.edit_file_menu.run()
if response == Gtk.ResponseType.CLOSE:
self.skip_edit = True

View File

@ -123,7 +123,7 @@ class WidgetFileActionMixin:
rename_label.set_label(entry)
rename_input.set_text(entry)
self.show_edit_file_menu()
self.show_edit_file_menu(rename_input)
if self.skip_edit:
self.skip_edit = False
continue

View File

@ -623,8 +623,15 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
</object>
<object class="GtkDialog" id="new_file_menu">
<property name="can-focus">False</property>
<property name="type">popup</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="window-position">center</property>
<property name="destroy-with-parent">True</property>
<property name="type-hint">splashscreen</property>
<property name="skip-taskbar-hint">True</property>
<property name="skip-pager-hint">True</property>
<property name="deletable">False</property>
<property name="gravity">center</property>
<signal name="focus-out-event" handler="hide_new_file_menu" swapped="no"/>
<child internal-child="vbox">
@ -776,9 +783,11 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
<object class="GtkDialog" id="file_exists_dialog">
<property name="height-request">120</property>
<property name="can-focus">False</property>
<property name="type">popup</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="window-position">center</property>
<property name="destroy-with-parent">True</property>
<property name="type-hint">splashscreen</property>
<property name="skip-taskbar-hint">True</property>
<property name="skip-pager-hint">True</property>
@ -1092,6 +1101,7 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
</object>
<object class="GtkDialog" id="edit_file_menu">
<property name="can-focus">False</property>
<property name="type">popup</property>
<property name="resizable">False</property>
<property name="modal">True</property>
<property name="window-position">center</property>
@ -1276,7 +1286,7 @@ SolarFM is developed on Atom, git, and using Python 3+ with Gtk GObject introspe
<property name="orientation">vertical</property>
<property name="baseline-position">top</property>
<child>
<object class="GtkBox">
<object class="GtkBox" id="top_main_menubar">
<property name="visible">True</property>
<property name="can-focus">False</property>
<child>