diff options
| author | lukefromdc <[email protected]> | 2016-08-31 21:01:49 -0400 |
|---|---|---|
| committer | lukefromdc <[email protected]> | 2016-08-31 21:01:49 -0400 |
| commit | b6dc8005f32c50bb3eb37f8fe17bdebf2f296e81 (patch) | |
| tree | 642d170ef8f2237639e040189085fea938dd75e4 | |
| parent | b833d3c4ce84f4a4d8644dd290e0a7b9480c722e (diff) | |
| download | caja-b6dc8005f32c50bb3eb37f8fe17bdebf2f296e81.tar.bz2 caja-b6dc8005f32c50bb3eb37f8fe17bdebf2f296e81.tar.xz | |
GTK3: stop warning spew from sidebar, pathbar
The button underallocation warnings came from pathbar sliders picking up padding from themes, then being forced to render to a smaller size in the code.
The GTK_ICON_LOOKUP_GENERIC_FALLBACK warnings came from the sidebar icons, this flag is now a source of errors. Unfortunately NULL does not work, so set GTK_ICON_LOOKUP_FORCE_SIZE, which does not create errors and ensures the icon size we actually want in the sidebar is used anyway.
Stops all but two of the warnings listed in
https://github.com/mate-desktop/caja/issues/561
| -rw-r--r-- | data/caja.css | 5 | ||||
| -rw-r--r-- | libcaja-private/caja-icon-info.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/data/caja.css b/data/caja.css index 1d3f629d..2aedab75 100644 --- a/data/caja.css +++ b/data/caja.css @@ -62,3 +62,8 @@ border-width: 0px; border-style: none; } + +/* Padding in slider buttons causes GTK errors in GTK 3.20 or later */ +.caja-navigation-window .slider-button { + padding: 0px; +} diff --git a/libcaja-private/caja-icon-info.c b/libcaja-private/caja-icon-info.c index 1a55ab47..38e49798 100644 --- a/libcaja-private/caja-icon-info.c +++ b/libcaja-private/caja-icon-info.c @@ -469,7 +469,7 @@ caja_icon_info_lookup (GIcon *icon, gtk_icon_info = gtk_icon_theme_lookup_by_gicon (gtk_icon_theme_get_default (), icon, size, - GTK_ICON_LOOKUP_GENERIC_FALLBACK); + GTK_ICON_LOOKUP_FORCE_SIZE); if (gtk_icon_info != NULL) { pixbuf = gtk_icon_info_load_icon (gtk_icon_info, NULL); |