[geary: 17/17] Merge branch 'mjog/1193-conversation-buttons-resize-race' into 'mainline'
- From: Michael Gratton <mjog src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [geary: 17/17] Merge branch 'mjog/1193-conversation-buttons-resize-race' into 'mainline'
- Date: Tue, 13 Apr 2021 15:22:16 +0000 (UTC)
commit 3af0d6286d1dfc1c79de7a708d307a7e39870ba1
Merge: 1de50614d 11882a105
Author: Michael Gratton <mike vee net>
Date: Tue Apr 13 15:22:14 2021 +0000
Merge branch 'mjog/1193-conversation-buttons-resize-race' into 'mainline'
Duplicate, don't re-parent, conversation actions as responsive layout changes.
Closes #1193
See merge request GNOME/geary!691
.gitlab-ci.yml | 2 +
meson.build | 22 +-
org.gnome.Geary.json | 18 ++
org.gnome.Geary.yaml | 13 +
po/POTFILES.in | 9 +-
.../application/application-main-window.vala | 306 ++++++++++++-------
.../components-conversation-action-bar.vala | 38 ---
.../components-conversation-actions.vala | 107 +++----
.../components-conversation-header-bar.vala | 71 -----
...n-toolbar.vala => components-main-toolbar.vala} | 79 +++--
src/client/composer/composer-box.vala | 4 +-
src/client/meson.build | 4 +-
src/meson.build | 9 +-
subprojects/libhandy.wrap | 5 +
ui/application-main-window.ui | 53 +++-
ui/components-conversation-action-bar.ui | 34 ---
ui/components-conversation-actions.ui | 325 +++++++++++----------
ui/components-conversation-header-bar.ui | 33 ---
...r-menus.ui => components-main-toolbar-menus.ui} | 0
ui/{main-toolbar.ui => components-main-toolbar.ui} | 84 +++++-
ui/geary.css | 10 +
ui/org.gnome.Geary.gresource.xml | 6 +-
22 files changed, 677 insertions(+), 555 deletions(-)
---
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]