nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't focus on the detach button on click

Browse source 
This way, we can maintain the selection when detaching the composer.
This commit is contained in:
Robert Schroll 2014-05-16 15:13:46 -07:00 • committed by Jim Nelson
parent cddf9461bb
commit 28eb213736
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/client/composer/composer-embed.vala
View file

@ -63,10 +63,17 @@ public class ComposerEmbed : Gtk.Bin, ComposerContainer {
on_focus_out();
composer.editor.focus_in_event.disconnect(on_focus_in);
composer.editor.focus_out_event.disconnect(on_focus_out);
Gtk.Widget focus = top_window.get_focus();
remove(composer);
new ComposerWindow(composer);
composer.set_focus();
ComposerWindow window = new ComposerWindow(composer);
if (focus != null) {
ComposerWindow focus_win = focus.get_toplevel() as ComposerWindow;
if (focus_win != null && focus_win == window)
focus.grab_focus();
} else {
composer.set_focus();
}
close();
}

1
ui/composer.glade
View file

@ -629,6 +629,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="focus_on_click">False</property>
</object>
<packing>
<property name="expand">False</property>