unity-scopes-shell

Merge lp:~stolowski/unity-scopes-shell/not-expandable into lp:unity-scopes-shell

not-expandable
Merge into trunk

Proposed by Paweł Stołowski on 2016-11-17

Status:	Approved
Approved by:	Marcus Tomlinson on 2016-12-08
Approved revision:	354
Proposed branch:	lp:~stolowski/unity-scopes-shell/not-expandable
Merge into:	lp:unity-scopes-shell
Diff against target:	31 lines (+3/-1) 2 files modified src/Unity/categories.cpp (+1/-1) tests/resultstest.cpp (+2/-0)
To merge this branch:	bzr merge lp:~stolowski/unity-scopes-shell/not-expandable
Related bugs:	Link a bug report

Reviewer	Review Type	Date Requested	Status
unity-api-1-bot	continuous-integration		Approve on 2016-12-08
Marcus Tomlinson (community)		2016-11-17	Approve on 2016-12-08
Review via email: mp+311173@code.launchpad.net

Commit message

Added new 'expandable' attribute to the default category renderer.

Description of the change

Added new 'expandable' attribute to the default category renderer.

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-11-18:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-shell-ci/5/rebuild

review: Needs Fixing (continuous-integration)

Revision history for this message

Marcus Tomlinson (marcustomlinson) wrote on 2016-12-08:

review: Approve

Revision history for this message

unity-api-1-bot (unity-api-1-bot) wrote on 2016-12-08:

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-shell-ci/7/rebuild

review: Approve (continuous-integration)

Unmerged revisions

354. By Paweł Stołowski on 2016-11-17: Added expandable attribute to the default category renderer

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Paweł Stołowski

Unity Team

1	=== modified file 'src/Unity/categories.cpp'
2	--- src/Unity/categories.cpp 2016-07-22 10:01:17 +0000
3	+++ src/Unity/categories.cpp 2016-11-17 16:50:39 +0000
4	@@ -41,7 +41,7 @@
5	const int MAX_NUMBER_OF_CATEGORIES = 32; // when reached, any excess categories which have no results will be removed
6
7	// FIXME: this should be in a common place
8	-#define CATEGORY_JSON_DEFAULTS R"({"schema-version":1,"template": {"category-layout":"grid","card-layout":"vertical","card-size":"small","overlay-mode":null,"collapsed-rows":2}, "components": { "title":null, "art": { "aspect-ratio":1.0 }, "subtitle":null, "social-actions":null, "mascot":null, "emblem":null, "summary":null, "attributes": { "max-count":2 }, "background":null, "overlay-color":null }, "resources":{}})"
9	+#define CATEGORY_JSON_DEFAULTS R"({"schema-version":1,"template": {"category-layout":"grid","card-layout":"vertical","card-size":"small","overlay-mode":null,"collapsed-rows":2,"expandable":true}, "components": { "title":null, "art": { "aspect-ratio":1.0 }, "subtitle":null, "social-actions":null, "mascot":null, "emblem":null, "summary":null, "attributes": { "max-count":2 }, "background":null, "overlay-color":null }, "resources":{}})"
10
11	class CategoryData
12	{
13
14	=== modified file 'tests/resultstest.cpp'
15	--- tests/resultstest.cpp 2016-05-05 09:40:46 +0000
16	+++ tests/resultstest.cpp 2016-11-17 16:50:39 +0000
17	@@ -647,6 +647,7 @@
18	{"card-size", sc::Variant("small")},
19	{"category-layout", sc::Variant("grid")},
20	{"collapsed-rows", sc::Variant(2.0)},
21	+ {"expandable", sc::Variant(true)},
22	{"overlay-mode", sc::Variant()}
23	};
24
25	@@ -687,6 +688,7 @@
26	{"card-size", sc::Variant("small")},
27	{"category-layout", sc::Variant("grid")},
28	{"collapsed-rows", sc::Variant(2.0)},
29	+ {"expandable", sc::Variant(true)},
30	{"overlay-mode", sc::Variant()}
31	};
32