games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Replaced lines in settings with primitives

Browse Source
This commit is contained in:
Ivan Savenko
2024-02-18 22:47:40 +02:00
parent ef8ff00973
commit bd901cb001
12 changed files with 38 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
Mods/vcmi/Data/settingsWindow/checkBoxEmpty.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 130 B

BIN
Mods/vcmi/Data/settingsWindow/lineHorizontal.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 90 B

BIN
Mods/vcmi/Data/settingsWindow/lineVertical.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 91 B

2
client/widgets/GraphicalPrimitiveCanvas.cpp
View File

@@ -1,5 +1,5 @@
/* /*
* MiscWidgets.cpp, part of VCMI engine * GraphicalPrimitiveCanvas.cpp, part of VCMI engine
* *
* Authors: listed in file AUTHORS in main folder * Authors: listed in file AUTHORS in main folder
* *

2
client/widgets/GraphicalPrimitiveCanvas.h
View File

@@ -13,7 +13,6 @@
class GraphicalPrimitiveCanvas : public CIntObject class GraphicalPrimitiveCanvas : public CIntObject
{ {
public:
enum class PrimitiveType enum class PrimitiveType
{ {
LINE, LINE,
@@ -21,7 +20,6 @@ public:
FILLED_BOX FILLED_BOX
}; };
private:
struct PrimitiveEntry struct PrimitiveEntry
{ {
ColorRGBA color; ColorRGBA color;

10
config/widgets/commonPrimitives.json
View File

@@ -26,7 +26,15 @@
{ "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : -1, "y" : 0}, "color" : [ 255, 255, 255, 64 ] }, { "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : -1, "y" : 0}, "color" : [ 255, 255, 255, 64 ] },
{ "type" : "line", "a" : { "x" : 0, "y" : 1}, "b" : { "x" : -1, "y" : 1}, "color" : [ 0, 0, 0, 64 ] }, { "type" : "line", "a" : { "x" : 0, "y" : 1}, "b" : { "x" : -1, "y" : 1}, "color" : [ 0, 0, 0, 64 ] },
] ]
} },
"verticalLine" : {
"type": "graphicalPrimitive",
"primitives" : [
{ "type" : "line", "a" : { "x" : 0, "y" : 0}, "b" : { "x" : 0, "y" : -1}, "color" : [ 255, 255, 255, 64 ] },
{ "type" : "line", "a" : { "x" : 1, "y" : 0}, "b" : { "x" : 1, "y" : -1}, "color" : [ 0, 0, 0, 64 ] },
]
},
"boxWithBackground" : { "boxWithBackground" : {
"type": "graphicalPrimitive", "type": "graphicalPrimitive",

8
config/widgets/settings/adventureOptionsTab.json
View File

@@ -1,12 +1,14 @@
{ {
"library" : "config/widgets/settings/library.json", "library" : [
"config/widgets/settings/library.json",
"config/widgets/commonPrimitives.json",
],
"items": "items":
[ [
{ {
"name": "lineLabelsEnd", "name": "lineLabelsEnd",
"type": "texture", "type": "horizontalLine",
"image": "settingsWindow/lineHorizontal",
"rect": { "x" : 5, "y" : 229, "w": 365, "h": 3} "rect": { "x" : 5, "y" : 229, "w": 365, "h": 3}
}, },
/////////////////////////////////////// Left section - Hero Speed and Map Scrolling /////////////////////////////////////// Left section - Hero Speed and Map Scrolling

11
config/widgets/settings/battleOptionsTab.json
View File

@@ -1,18 +1,19 @@
{ {
"library" : "config/widgets/settings/library.json", "library" : [
"config/widgets/settings/library.json",
"config/widgets/commonPrimitives.json",
],
"items": "items":
[ [
{ {
"name": "lineCreatureInfo", "name": "lineCreatureInfo",
"type": "texture", "type": "horizontalLine",
"image": "settingsWindow/lineHorizontal",
"rect": { "x" : 5, "y" : 289, "w": 365, "h": 3} "rect": { "x" : 5, "y" : 289, "w": 365, "h": 3}
}, },
{ {
"name": "lineAnimationSpeed", "name": "lineAnimationSpeed",
"type": "texture", "type": "horizontalLine",
"image": "settingsWindow/lineHorizontal",
"rect": { "x" : 5, "y" : 349, "w": 365, "h": 3} "rect": { "x" : 5, "y" : 349, "w": 365, "h": 3}
}, },
{ {

8
config/widgets/settings/generalOptionsTab.json
View File

@@ -1,12 +1,14 @@
{ {
"library" : "config/widgets/settings/library.json", "library" : [
"config/widgets/settings/library.json",
"config/widgets/commonPrimitives.json",
],
"items": "items":
[ [
{ {
"name": "lineLabelsEnd", "name": "lineLabelsEnd",
"type": "texture", "type": "horizontalLine",
"image": "settingsWindow/lineHorizontal",
"rect": { "x" : 5, "y" : 349, "w": 365, "h": 3} "rect": { "x" : 5, "y" : 349, "w": 365, "h": 3}
}, },
{ {

5
config/widgets/settings/library.json
View File

@@ -35,8 +35,9 @@
] ]
}, },
"checkboxFake" : { "checkboxFake" : {
"type": "picture", "type": "boxWithBackground",
"image": "settingsWindow/checkBoxEmpty" "rect": { "x" : 0, "y" : 0, "w": 32, "h": 24}
}, },
"audioSlider" : { "audioSlider" : {
"type": "slider", "type": "slider",

13
config/widgets/settings/settingsMainContainer.json
View File

@@ -1,4 +1,8 @@
{ {
"library" : [
"config/widgets/commonPrimitives.json"
],
"items": "items":
[ [
{ {
@@ -9,14 +13,12 @@
}, },
{ {
"name": "lineTabs", "name": "lineTabs",
"type": "texture", "type": "horizontalLine",
"image": "settingsWindow/lineHorizontal",
"rect": { "x" : 10, "y" : 45, "w": 580, "h": 3} "rect": { "x" : 10, "y" : 45, "w": 580, "h": 3}
}, },
{ {
"name": "lineColumns", "name": "lineColumns",
"type": "texture", "type": "verticalLine",
"image": "settingsWindow/lineVertical",
"rect": { "x" : 370, "y" : 50, "w": 3, "h": 420} "rect": { "x" : 370, "y" : 50, "w": 3, "h": 420}
}, },
@@ -91,8 +93,7 @@
{ {
"name": "lineButtons", "name": "lineButtons",
"type": "texture", "type": "horizontalLine",
"image": "settingsWindow/lineHorizontal",
"rect": { "x" : 375, "y" : 289, "w": 220, "h": 3} "rect": { "x" : 375, "y" : 289, "w": 220, "h": 3}
}, },
{ {

6
config/widgets/turnOptionsTab.json
View File

@@ -33,10 +33,8 @@
"offset": {"x": 0, "y": 0} "offset": {"x": 0, "y": 0}
}, },
"timeInputBackground" : { "timeInputBackground" : {
"type": "transparentFilledRectangle", "type": "boxWithBackground",
"rect": {"x": 0, "y": 0, "w": 86, "h": 23}, "rect": {"x": 0, "y": 0, "w": 86, "h": 23}
"color": [0, 0, 0, 128],
"colorLine": [64, 80, 128, 128]
} }
}, },