diff options
| -rw-r--r-- | resources/dash-widgets.json | 54 | ||||
| -rw-r--r-- | unity-shared/PlacesOverlayVScrollBar.cpp | 1 |
2 files changed, 34 insertions, 21 deletions
diff --git a/resources/dash-widgets.json b/resources/dash-widgets.json index 11da04b10..dbf05e471 100644 --- a/resources/dash-widgets.json +++ b/resources/dash-widgets.json @@ -9,35 +9,41 @@ "bag" : ["/usr/share/icons/unity/bag.svg", "32px", "32px"], "next" : ["/usr/share/icons/unity/next.svg", "32px", "32px"], "prev" : ["/usr/share/icons/unity/prev.svg", "32px", "32px"], - "play" : ["/usr/share/icons/unity/play.svg", "32px", "32px"]}, + "play" : ["/usr/share/icons/unity/play.svg", "32px", "32px"] + }, "regular-text" : { "text-color" : "#ffffff", - "text-opacity" : 1.0, + "text-opacity" : 1.0, "text-size" : 13.0, "text-mode" : "normal", - "text-weight" : "regular"}, + "text-weight" : "regular" + }, "comments": { - "states" : ["ACTIVE", "NORMAL","PRELIGHT","SELECTED","INSENSITIVE"]}, + "states" : ["ACTIVE", "NORMAL","PRELIGHT","SELECTED","INSENSITIVE"] + }, "button-icon": { "color" : ["#ffffff", "#FFFFFF", "#FFFFFF", "#FFFFFF", "#FFFFFF"], "opacity" : [ 1.0, 1.0, 1.0, 0.8, 0.8], "overlay-opacity": [ 0.30, 0.48, 0.48, 0.45, 0.45], "overlay-mode" : [ "normal","multiply", "multiply", "normal", "normal"], - "blur-size" : [ 5, 0, 0, 0, 0]}, + "blur-size" : [ 5, 0, 0, 0, 0] + }, "icon-only" : { "color" : "#123456", "opacity" : 1.0, "overlay-opacity": 0.2, "overlay-mode" : "normal", - "blur-size" : 6}, + "blur-size" : 6 + }, "lens-nav-bar" : { "icon-height" : 20, - "icon-gap" : 40}, + "icon-gap" : 40 + }, "button-label": { "border-opacity" : [ 0.8, 0.13, 0.13, 0.13, 0.13], @@ -45,17 +51,19 @@ "border-size" : [ 2.0, 1.0, 1.0, 0.5, 0.5], "text-size" : 1.0, "text-color" : ["#ffffff", "#ffffff", "#ffffff", "#ffffff", "#ffffff"], - "text-opacity" : [ 1.0, 1.0, 1.0, 1.0, 1.0], + "text-opacity" : [ 1.0, 1.0, 1.0, 1.0, 1.0], "fill-color" : ["#FFFFFF", "#000000", "#000000", "#000000", "#000000"], "fill-opacity" : [ 0.13, 0.0, 0.0, 0.0, 0.0], "overlay-opacity": [ 0.1, 0.1, 0.1, 0.0, 0.0], "overlay-mode" : [ "normal", "normal", "normal", "normal", "normal"], - "blur-size" : [ 1, 1, 1, 0, 0]}, + "blur-size" : [ 1, 1, 1, 0, 0] + }, "track-view" : { "line-gap" : 26.0, "heading-list-gap" : 30, - "left-padding" : 20}, + "left-padding" : 20 + }, "row-caption" : { "main-text-color" : "#ffffff", @@ -68,7 +76,8 @@ "sub-text-weight" : "regular", "icon-main-gap" : 10, "main-sub-gap" : 15, - "sub-arrow-gap" : 10}, + "sub-arrow-gap" : 10 + }, "preview-heading-small" : { "main-title-size" : 23.0, @@ -82,7 +91,8 @@ "sub-title-mode" : "normal", "sub-title-weight" : "regular", "main-sub-gap" : 15, - "padding" : 10}, + "padding" : 10 + }, "preview-heading" : { "main-title-size" : 30.0, @@ -96,16 +106,18 @@ "sub-title-mode" : "normal", "sub-title-weight" : "regular", "main-sub-gap" : 15, - "padding" : 10}, + "padding" : 10 + }, - "scrollbar" : { + "scrollbar" : { "color" : "#ffffff", "opacity" : 1.0, "overlay-opacity": 0.30, "overlay-mode" : "normal", "blur-size" : 5, "size" : 3, - "corner-radius" : 1.5}, + "corner-radius" : 1.5 + }, "filter-pane" : { "width" : 330, @@ -116,15 +128,17 @@ "title-style" : "bold", "title-arrow-gap" : 10, "button-height" : 30, - "border-size" : 1}, + "border-size" : 1 + }, "separator" : { "size" : 1.0, "color" : "#ffffff", - "opacity" : 0.15, + "opacity" : 0.15, "overlay-opacity": 0.47, "overlay-mode" : "normal", - "blur-size" : 6}, + "blur-size" : 6 + }, "filter-caption" : { "text-size" : 17, @@ -132,6 +146,6 @@ "text-opacity" : 1.0, "text-mode" : "normal", "text-weight" : "bold", - "text-arrow-gap" : 10} - + "text-arrow-gap" : 10 + } } diff --git a/unity-shared/PlacesOverlayVScrollBar.cpp b/unity-shared/PlacesOverlayVScrollBar.cpp index 0726b1e93..854812911 100644 --- a/unity-shared/PlacesOverlayVScrollBar.cpp +++ b/unity-shared/PlacesOverlayVScrollBar.cpp @@ -152,4 +152,3 @@ void PlacesOverlayVScrollBar::StartScrollAnimation(ScrollDir dir, int stop, unsi } // namespace dash } // namespace unity - |