AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

entry: Use better element name for progress

Browse Source 
Change the name of the CSS subnode for progress rendering from
progressbar to progress. This will align better with GtkProgressBar.
This commit is contained in:
Matthias Clasen 2015-10-26 21:32:26 -04:00
parent aefa1ba611
commit c72d094ae0
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk/gtkentry.c
View File

@ -123,7 +123,7 @@
* When the entry shows icons, it adds subnodes with the name image and the
* style class .left or .right, depending on where the icon appears.
*
* When the entry shows progress, it adds a subnode with the name progressbar.
* When the entry shows progress, it adds a subnode with the name progress.
* The node has the style class .pulse when the shown progress is pulsing.
*/
@ -10673,7 +10673,7 @@ gtk_entry_ensure_progress_node (GtkEntry *entry)
widget_node = gtk_widget_get_css_node (GTK_WIDGET (entry));
priv->progress_node = gtk_css_node_new ();
gtk_css_node_set_name (priv->progress_node, I_("progressbar"));
gtk_css_node_set_name (priv->progress_node, I_("progress"));
gtk_css_node_set_parent (priv->progress_node, widget_node);
gtk_css_node_set_state (priv->progress_node, gtk_css_node_get_state (widget_node));
g_object_unref (priv->progress_node);

2
gtk/theme/Adwaita/_common.scss
View File

@ -249,7 +249,7 @@ entry {
@extend %selected_items;
}
& progressbar {
& progress {
margin: 1px;
border-radius: 0;
border-width: 0 0 2px;

4
gtk/theme/Adwaita/gtk-contained-dark.css
View File

@ -203,7 +203,7 @@ entry {
border-color: #1f2222;
background-image: linear-gradient(to bottom, #333636);
box-shadow: 0 1px rgba(238, 238, 236, 0); }
entry progressbar {
entry progress {
margin: 1px;
border-radius: 0;
border-width: 0 0 2px;
@ -212,7 +212,7 @@ entry {
background-image: none;
background-color: transparent;
box-shadow: none; }
entry progressbar:backdrop {
entry progress:backdrop {
background-color: transparent; }
.linked:not(.vertical) > entry:focus + entry, .linked:not(.vertical) > entry:focus + .button, .linked:not(.vertical) > entry:focus + GtkComboBox > .the-button-in-the-combobox, .linked:not(.vertical) > entry:focus + GtkComboBoxText > .the-button-in-the-combobox {
border-left-color: #0f2b48; }

4
gtk/theme/Adwaita/gtk-contained.css
View File

@ -203,7 +203,7 @@ entry {
border-color: darkgray;
background-image: linear-gradient(to bottom, #f4f4f4);
box-shadow: 0 1px rgba(255, 255, 255, 0); }
entry progressbar {
entry progress {
margin: 1px;
border-radius: 0;
border-width: 0 0 2px;
@ -212,7 +212,7 @@ entry {
background-image: none;
background-color: transparent;
box-shadow: none; }
entry progressbar:backdrop {
entry progress:backdrop {
background-color: transparent; }
.linked:not(.vertical) > entry:focus + entry, .linked:not(.vertical) > entry:focus + .button, .linked:not(.vertical) > entry:focus + GtkComboBox > .the-button-in-the-combobox, .linked:not(.vertical) > entry:focus + GtkComboBoxText > .the-button-in-the-combobox {
border-left-color: #4a90d9; }

2
gtk/theme/HighContrast/_common.scss
View File

@ -206,7 +206,7 @@ entry {
&:selected:focus {
@extend %selected_items;
}
& progressbar {
& progress {
margin: 1px;
border-radius: 0;
border-width: 0 0 2px;

4
gtk/theme/HighContrast/gtk.css
View File

@ -246,7 +246,7 @@ entry {
entry:selected, entry:backdrop:selected {
background-color: #000;
color: #fff; }
entry progressbar {
entry progress {
margin: 1px;
border-radius: 0;
border-width: 0 0 2px;
@ -255,7 +255,7 @@ entry {
background-image: none;
background-color: transparent;
box-shadow: none; }
entry progressbar:backdrop {
entry progress:backdrop {
background-color: transparent; }
.linked entry:first-child {
border-top-right-radius: 0;