Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'wip/baedert/for-master' into 'main'

Browse Source 
application demo: Resolve a keyboard shortcut conflict

See merge request GNOME/gtk!4290
This commit is contained in:
Matthias Clasen
2021-12-29 00:24:46 +00:00
parent 0aad053507 e94d5bf006
commit fa71a2a993
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demos/gtk-demo/menus.ui
View File

@@ -21,7 +21,7 @@
<item>
<attribute name="label" translatable="yes">Save _As...</attribute>
<attribute name="action">app.save-as</attribute>
<attribute name="accel">&lt;Control&gt;s</attribute>
<attribute name="accel">&lt;Control&gt;&lt;Shift&gt;s</attribute>
</item>
</section>
<section>

4
gtk/gtkapplicationwindow.c
View File

@@ -435,9 +435,11 @@ gtk_application_window_measure (GtkWidget *widget,
gtk_widget_measure (priv->menubar, GTK_ORIENTATION_VERTICAL,
for_size, &menubar_height, NULL, NULL, NULL);
GTK_WIDGET_CLASS (gtk_application_window_parent_class)->measure (widget,
orientation,
for_size - menubar_height,
for_size > -1 ?
for_size - menubar_height : -1,
minimum, natural,
minimum_baseline, natural_baseline);