Merge branch 'wip/jimmac/HC-italic-hints' into 'main'

HC: entry - make hints italic

Closes #5143

See merge request GNOME/gtk!4994
This commit is contained in:
Matthias Clasen 2022-08-29 18:55:34 +00:00
commit e077a6bffe
3 changed files with 4 additions and 2 deletions

View File

@ -181,6 +181,7 @@ setup_tweak_button (GtkFontChooserDialog *dialog)
gtk_widget_set_focus_on_click (button, FALSE); gtk_widget_set_focus_on_click (button, FALSE);
gtk_widget_set_valign (button, GTK_ALIGN_CENTER); gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
gtk_button_set_icon_name (GTK_BUTTON (button), "emblem-system-symbolic"); gtk_button_set_icon_name (GTK_BUTTON (button), "emblem-system-symbolic");
gtk_widget_set_tooltip_text (button, _("Change Font Features"));
header = gtk_dialog_get_header_bar (GTK_DIALOG (dialog)); header = gtk_dialog_get_header_bar (GTK_DIALOG (dialog));
gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button); gtk_header_bar_pack_end (GTK_HEADER_BAR (header), button);

View File

@ -316,6 +316,7 @@ entry {
> text > placeholder { > text > placeholder {
@extend .dim-label; @extend .dim-label;
@if $contrast == 'high' { font-style: italic; }
} }
> text > block-cursor { > text > block-cursor {

View File

@ -185,7 +185,7 @@
</child> </child>
<child> <child>
<object class="GtkEntry" id="preview"> <object class="GtkEntry" id="preview">
<property name="placeholder-text" translatable="yes">Preview text</property> <property name="tooltip-text" translatable="yes">Preview Font</property>
<child> <child>
<object class="GtkEventControllerScroll"> <object class="GtkEventControllerScroll">
<property name="flags" translatable="yes">horizontal</property> <property name="flags" translatable="yes">horizontal</property>
@ -321,7 +321,7 @@
</child> </child>
<child> <child>
<object class="GtkEntry" id="preview2"> <object class="GtkEntry" id="preview2">
<property name="placeholder-text" translatable="yes">Preview text</property> <property name="tooltip-text" translatable="yes">Preview Font</property>
<property name="text" bind-source="preview" bind-property="text" bind-flags="bidirectional"/> <property name="text" bind-source="preview" bind-property="text" bind-flags="bidirectional"/>
<property name="attributes" bind-source="preview" bind-property="attributes" bind-flags="bidirectional"/> <property name="attributes" bind-source="preview" bind-property="attributes" bind-flags="bidirectional"/>
</object> </object>