corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug 1319650 implement pre-3.20 MOZ_GTK_PROGRESS_CHUNK in WidgetStyleCache r=stransky+263117

Browse Source 
MozReview-Commit-ID: 1VOZKRw3gj4
This commit is contained in:
Karl Tomlinson
2016-11-25 17:51:13 +13:00
parent 8a93d4e955
commit e3fb1b16a8
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
widget/gtk/WidgetStyleCache.cpp
View File

@@ -997,6 +997,13 @@ GetWidgetStyleInternal(WidgetNodeType aNodeType)
case MOZ_GTK_PROGRESS_TROUGH: case MOZ_GTK_PROGRESS_TROUGH:
return GetWidgetStyleWithClass(MOZ_GTK_PROGRESSBAR, return GetWidgetStyleWithClass(MOZ_GTK_PROGRESSBAR,
GTK_STYLE_CLASS_TROUGH); GTK_STYLE_CLASS_TROUGH);
case MOZ_GTK_PROGRESS_CHUNK: {
GtkStyleContext* style =
GetWidgetStyleWithClass(MOZ_GTK_PROGRESSBAR,
GTK_STYLE_CLASS_PROGRESSBAR);
gtk_style_context_remove_class(style, GTK_STYLE_CLASS_TROUGH);
return style;
}
case MOZ_GTK_GRIPPER: case MOZ_GTK_GRIPPER:
return GetWidgetStyleWithClass(MOZ_GTK_GRIPPER, return GetWidgetStyleWithClass(MOZ_GTK_GRIPPER,
GTK_STYLE_CLASS_GRIP); GTK_STYLE_CLASS_GRIP);

13
widget/gtk/gtk3drawing.cpp
View File

@@ -1376,17 +1376,8 @@ moz_gtk_progress_chunk_paint(cairo_t *cr, GdkRectangle* rect,
GtkTextDirection direction, GtkTextDirection direction,
WidgetNodeType widget) WidgetNodeType widget)
{ {
GtkStyleContext* style; GtkStyleContext* style =
ClaimStyleContext(MOZ_GTK_PROGRESS_CHUNK, direction);
if (gtk_check_version(3, 20, 0) != nullptr) {
/* Ask for MOZ_GTK_PROGRESS_TROUGH instead of MOZ_GTK_PROGRESSBAR
* because ClaimStyleContext() saves/restores that style */
style = ClaimStyleContext(MOZ_GTK_PROGRESS_TROUGH, direction);
gtk_style_context_remove_class(style, GTK_STYLE_CLASS_TROUGH);
gtk_style_context_add_class(style, GTK_STYLE_CLASS_PROGRESSBAR);
} else {
style = ClaimStyleContext(MOZ_GTK_PROGRESS_CHUNK, direction);
}
if (widget == MOZ_GTK_PROGRESS_CHUNK_INDETERMINATE || if (widget == MOZ_GTK_PROGRESS_CHUNK_INDETERMINATE ||
widget == MOZ_GTK_PROGRESS_CHUNK_VERTICAL_INDETERMINATE) { widget == MOZ_GTK_PROGRESS_CHUNK_VERTICAL_INDETERMINATE) {