Peter M. Groen / dali-demo

Commit e32aa313e35269ecb61ccd4865d0ee9225d71ade

Authored by Adeel Kazmi
1 parent cdef6adc

Changed the theme of the some examples to match the new button style 

Change-Id: I217ca9c6358df9beaa218fbd506baaaa55d770e5
Inline Side-by-side
Showing 3 changed files with 8 additions and 12 deletions
examples/buttons/buttons-example.cpp
  View file @e32aa31
1 1 /*
2   - * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2022 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -28,7 +28,7 @@ using namespace Dali;
28 28  
29 29 namespace
30 30 {
31   -const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "background-gradient.jpg";
  31 +const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "background-default.png";
32 32 const char* const TOOLBAR_IMAGE = DEMO_IMAGE_DIR "top-bar.png";
33 33  
34 34 const char* const TOOLBAR_TITLE = "Buttons";
... ... @@ -44,20 +44,16 @@ const char* const BIG_IMAGE_3 = DEMO_IMAGE_DIR "gallery-large-13.jpg";
44 44  
45 45 const char* const ENABLED_IMAGE = DEMO_IMAGE_DIR "item-select-check.png";
46 46  
47   -const Vector4 BACKGROUND_COLOUR(1.0f, 1.0f, 1.0f, 0.15f);
  47 +const Vector4 BACKGROUND_COLOUR(0.25f, 0.25f, 0.25f, 0.15f);
48 48  
49 49 // Layout sizes
50   -const int RADIO_LABEL_THUMBNAIL_SIZE = 60;
  50 +const int RADIO_LABEL_THUMBNAIL_SIZE = 50;
51 51 const int RADIO_LABEL_THUMBNAIL_SIZE_SMALL = 40;
52 52 const int RADIO_IMAGE_SPACING = 8;
53 53 const int BUTTON_HEIGHT = 48;
54 54  
55 55 const int MARGIN_SIZE = 10;
56 56 const int TOP_MARGIN = 85;
57   -const int GROUP2_HEIGHT = 238;
58   -const int GROUP1_HEIGHT = 120;
59   -const int GROUP3_HEIGHT = 190;
60   -const int GROUP4_HEIGHT = BUTTON_HEIGHT + MARGIN_SIZE * 2;
61 57  
62 58 } // namespace
63 59  
... ...
examples/popup/popup-example.cpp
  View file @e32aa31
1 1 /*
2   - * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2022 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -33,7 +33,7 @@ struct ButtonItem
33 33  
34 34 namespace
35 35 {
36   -const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "background-gradient.jpg";
  36 +const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "background-default.png";
37 37 const char* const TOOLBAR_IMAGE = DEMO_IMAGE_DIR "top-bar.png";
38 38  
39 39 const char* const TOOLBAR_TITLE = "Popup";
... ...
examples/size-negotiation/size-negotiation-example.cpp
  View file @e32aa31
1 1 /*
2   - * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2022 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -34,7 +34,7 @@ struct ButtonItem
34 34  
35 35 namespace
36 36 {
37   -const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "background-gradient.jpg";
  37 +const char* const BACKGROUND_IMAGE = DEMO_IMAGE_DIR "background-default.png";
38 38 const char* const TOOLBAR_IMAGE = DEMO_IMAGE_DIR "top-bar.png";
39 39 const char* const IMAGE = DEMO_IMAGE_DIR "background-magnifier.jpg";
40 40  
... ...