summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Clasen <mclasen@redhat.com>2017-12-26 08:39:29 -0500
committerMatthias Clasen <mclasen@redhat.com>2017-12-26 08:40:43 -0500
commitd04f66eb524294e7de55e87a0104c457033c1dc5 (patch)
tree549d5992f5bf2f7890de37790bfdc63db028c931
parentd5f215f96daa2086a296dd9ac6d73effa011b1cb (diff)
downloadgtk+-d04f66eb524294e7de55e87a0104c457033c1dc5.tar.gz
Add GtkIconSize back to the docs
And document how it works now.
-rw-r--r--docs/reference/gtk/css-properties.xml2
-rw-r--r--docs/reference/gtk/gtk4-sections.txt1
-rw-r--r--gtk/gtkenums.h4
3 files changed, 6 insertions, 1 deletions
diff --git a/docs/reference/gtk/css-properties.xml b/docs/reference/gtk/css-properties.xml
index 81be2efb22..42837b07cc 100644
--- a/docs/reference/gtk/css-properties.xml
+++ b/docs/reference/gtk/css-properties.xml
@@ -569,7 +569,7 @@ We use <literallayout> for syntax productions, and each line is put in a <code>
<entry>✓</entry>
<entry></entry>
<entry></entry>
- <entry>Determines the size at which icons are displayed</entry>
+ <entry>Determines the size at which icons are displayed. See GtkIconSize</entry>
</row>
</tbody>
</tgroup>
diff --git a/docs/reference/gtk/gtk4-sections.txt b/docs/reference/gtk/gtk4-sections.txt
index bea54de643..9a25b3132b 100644
--- a/docs/reference/gtk/gtk4-sections.txt
+++ b/docs/reference/gtk/gtk4-sections.txt
@@ -5300,6 +5300,7 @@ GtkShadowType
GtkStateFlags
GtkToolbarStyle
GtkSortType
+GtkIconSize
</SECTION>
diff --git a/gtk/gtkenums.h b/gtk/gtkenums.h
index a75429b8f9..81c20f1dec 100644
--- a/gtk/gtkenums.h
+++ b/gtk/gtkenums.h
@@ -183,6 +183,10 @@ typedef enum
*
* Icon sizes default to being inherited. Where they cannot be
* inherited, text size is the default.
+ *
+ * All widgets which use GtkIconSize set the normal-icons or large-icons
+ * style classes correspondingly, and let themes determine the actual size
+ * to be used with the -gtk-icon-size CSS property.
*/
typedef enum
{