alysbrooks-public » games » isometric-park-fna

Commit r289:cd18b18b086e public

parent | child
Description:
Tweak selected text color.
Commit status:
[Not Reviewed]
References:
default
Diff options:
Raw Diff | Patch Diff | Download Diff
Comments:
0 Commit comments 0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
Add another comment
Browse Files

r289:cd18b18b086e -

Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
@@ -1,1 +1,1
1 ccf73b859df7dddc357676bd95436a0b13bdd512
1 8ee6b95dcd628b76a0d5ee914132625645a90707
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
@@ -1,1 +1,1
1 7fc94ca5d2df7983f4c94adbc56e102db8f3e2d1
1 9357c23556f7ce44cd6450dcfb2deacb261f2505
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
@@ -1,1 +1,1
1 eb53a31a465d1700585a27323fb9618e935e3337
1 7bbcd971441293d3543e03c61356b4763d0b75e2
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
@@ -1,1 +1,1
1 6e5464032d916221797274aa2d6596787facae0f
1 75ef82d1a984e501d454b9f38f8c12701d7be869
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
1 NO CONTENT: modified file, binary diff hidden
NO CONTENT: modified file, binary diff hidden
Show file before | Show file after | Show commentsHide comments
@@ -1,14 +1,14
1 {
1 {
2 "format": 1,
2 "format": 1,
3 "restore": {
3 "restore": {
4 "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj": {}
4 "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj": {}
5 },
5 },
6 "projects": {
6 "projects": {
7 "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
7 "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
8 "restore": {
8 "restore": {
9 "projectUniqueName": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj",
9 "projectUniqueName": "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj",
10 "projectName": "FNA",
10 "projectName": "FNA",
11 "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj",
11 "projectPath": "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj",
12 "frameworks": {
12 "frameworks": {
13 "net48": {
13 "net48": {
14 "projectReferences": {}
14 "projectReferences": {}
@@ -19,17 +19,17
19 "net48": {}
19 "net48": {}
20 }
20 }
21 },
21 },
22 "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj": {
22 "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj": {
23 "version": "1.0.0",
23 "version": "1.0.0",
24 "restore": {
24 "restore": {
25 "projectUniqueName": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
25 "projectUniqueName": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
26 "projectName": "SpriteFontPlus",
26 "projectName": "SpriteFontPlus",
27 "projectPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
27 "projectPath": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
28 "packagesPath": "/Users/alys/.nuget/packages/",
28 "packagesPath": "/home/alys/.nuget/packages/",
29 "outputPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/",
29 "outputPath": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/",
30 "projectStyle": "PackageReference",
30 "projectStyle": "PackageReference",
31 "configFilePaths": [
31 "configFilePaths": [
32 "/Users/alys/.config/NuGet/NuGet.Config"
32 "/home/alys/.config/NuGet/NuGet.Config"
33 ],
33 ],
34 "originalTargetFrameworks": [
34 "originalTargetFrameworks": [
35 "net45"
35 "net45"
@@ -40,8 +40,8
40 "frameworks": {
40 "frameworks": {
41 "net45": {
41 "net45": {
42 "projectReferences": {
42 "projectReferences": {
43 "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
43 "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
44 "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj"
44 "projectPath": "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj"
45 }
45 }
46 }
46 }
47 }
47 }
@@ -54,7 +54,7
54 },
54 },
55 "frameworks": {
55 "frameworks": {
56 "net45": {
56 "net45": {
57 "runtimeIdentifierGraphPath": "/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/Current/bin/RuntimeIdentifierGraph.json"
57 "runtimeIdentifierGraphPath": "/usr/lib/mono/msbuild/Current/bin/RuntimeIdentifierGraph.json"
58 }
58 }
59 }
59 }
60 }
60 }
Show file before | Show file after | Show commentsHide comments
@@ -4,8 +4,8
4 <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
4 <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
5 <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
5 <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
6 <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
6 <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
7 <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/Users/alys/.nuget/packages/</NuGetPackageRoot>
7 <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/home/alys/.nuget/packages/</NuGetPackageRoot>
8 <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/Users/alys/.nuget/packages/</NuGetPackageFolders>
8 <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/home/alys/.nuget/packages/</NuGetPackageFolders>
9 <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
9 <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
10 <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.6.0</NuGetToolVersion>
10 <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">5.6.0</NuGetToolVersion>
11 </PropertyGroup>
11 </PropertyGroup>
Show file before | Show file after | Show commentsHide comments
@@ -26,19 +26,19
26 ]
26 ]
27 },
27 },
28 "packageFolders": {
28 "packageFolders": {
29 "/Users/alys/.nuget/packages/": {}
29 "/home/alys/.nuget/packages/": {}
30 },
30 },
31 "project": {
31 "project": {
32 "version": "1.0.0",
32 "version": "1.0.0",
33 "restore": {
33 "restore": {
34 "projectUniqueName": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
34 "projectUniqueName": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
35 "projectName": "SpriteFontPlus",
35 "projectName": "SpriteFontPlus",
36 "projectPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
36 "projectPath": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
37 "packagesPath": "/Users/alys/.nuget/packages/",
37 "packagesPath": "/home/alys/.nuget/packages/",
38 "outputPath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/",
38 "outputPath": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/obj/",
39 "projectStyle": "PackageReference",
39 "projectStyle": "PackageReference",
40 "configFilePaths": [
40 "configFilePaths": [
41 "/Users/alys/.config/NuGet/NuGet.Config"
41 "/home/alys/.config/NuGet/NuGet.Config"
42 ],
42 ],
43 "originalTargetFrameworks": [
43 "originalTargetFrameworks": [
44 "net45"
44 "net45"
@@ -49,8 +49,8
49 "frameworks": {
49 "frameworks": {
50 "net45": {
50 "net45": {
51 "projectReferences": {
51 "projectReferences": {
52 "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
52 "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj": {
53 "projectPath": "/Users/alys/repos/isometric-park-fna/FNA/FNA.csproj"
53 "projectPath": "/home/alys/repos/isometric-park-fna/FNA/FNA.csproj"
54 }
54 }
55 }
55 }
56 }
56 }
@@ -63,7 +63,7
63 },
63 },
64 "frameworks": {
64 "frameworks": {
65 "net45": {
65 "net45": {
66 "runtimeIdentifierGraphPath": "/Library/Frameworks/Mono.framework/Versions/6.12.0/lib/mono/msbuild/Current/bin/RuntimeIdentifierGraph.json"
66 "runtimeIdentifierGraphPath": "/usr/lib/mono/msbuild/Current/bin/RuntimeIdentifierGraph.json"
67 }
67 }
68 }
68 }
69 }
69 }
Show file before | Show file after | Show commentsHide comments
@@ -1,8 +1,8
1 {
1 {
2 "version": 2,
2 "version": 2,
3 "dgSpecHash": "kUPsWi+W/I8KOuiF0fQ9nWh1vVsW3b0wAQVjldBK6JNRF3usvNENwsXcLXddNG6Wh/129HHhkfaanQmLUK7wcA==",
3 "dgSpecHash": "tOnJ1OKHA9fVe0r0rF8SXkY/g6Dsae+u1nunMHJtIiHm2UrxMmZk6x6accdLrAYlwIjYkj7fcv/RHNfOBL/3Kg==",
4 "success": true,
4 "success": true,
5 "projectFilePath": "/Users/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
5 "projectFilePath": "/home/alys/repos/isometric-park-fna/SpriteFontPlus/src/SpriteFontPlus.FNA.csproj",
6 "expectedPackageFiles": [],
6 "expectedPackageFiles": [],
7 "logs": []
7 "logs": []
8 } No newline at end of file
8 }
Show file before | Show file after | Show commentsHide comments
@@ -17,6 +17,7
17 public static class ContractsWindow
17 public static class ContractsWindow
18 {
18 {
19 public static bool show_all;
19 public static bool show_all;
20 public static bool had_focus = false;
20
21
21 private static (Entity entity, string name, string description, ContractStatus status, decimal amount, string delta_trees, int image_index) selected;
22 private static (Entity entity, string name, string description, ContractStatus status, decimal amount, string delta_trees, int image_index) selected;
22
23
@@ -36,7 +37,17
36 StyleSet.pushColorSet(StyleSet.defaultWindowColors);
37 StyleSet.pushColorSet(StyleSet.defaultWindowColors);
37
38
38 ImGui.SetNextWindowSize(new Num.Vector2(320, 340));
39 ImGui.SetNextWindowSize(new Num.Vector2(320, 340));
40 if(ContractsWindow.had_focus)
41 {
42 ImGui.PushStyleColor(ImGuiCol.Text, StyleSet.white);
43 }
39 ImGui.Begin("Contracts", ref newShow, ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoSavedSettings);
44 ImGui.Begin("Contracts", ref newShow, ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoSavedSettings);
45 if (ContractsWindow.had_focus)
46 {
47 ImGui.PopStyleColor();
48 }
49 ContractsWindow.had_focus = ImGui.IsWindowFocused();
50
40 ImGui.ListBoxHeader("##Contracts:", new Num.Vector2(320, 150));
51 ImGui.ListBoxHeader("##Contracts:", new Num.Vector2(320, 150));
41
52
42 var filter_statuses = new[] {ContractStatus.Expired, ContractStatus.Broken, ContractStatus.Rejected};
53 var filter_statuses = new[] {ContractStatus.Expired, ContractStatus.Broken, ContractStatus.Rejected};
Show file before | Show file after | Show commentsHide comments
@@ -18,12 +18,13
18 if (active) {
18 if (active) {
19 ImGui.PushStyleColor(ImGuiCol.Button, activeColor);
19 ImGui.PushStyleColor(ImGuiCol.Button, activeColor);
20 ImGui.PushStyleColor(ImGuiCol.ButtonHovered, activeColor);
20 ImGui.PushStyleColor(ImGuiCol.ButtonHovered, activeColor);
21 ImGui.PushStyleColor(ImGuiCol.Text, StyleSet.white);
21 }
22 }
22
23
23 var result = ImGui.Button(label);
24 var result = ImGui.Button(label);
24
25
25 if (active) {
26 if (active) {
26 ImGui.PopStyleColor(2);
27 ImGui.PopStyleColor(3);
27 }
28 }
28
29
29 return result;
30 return result;
@@ -46,56 +47,56
46
47
47 ImGui.SetCursorPosX(width - 520);
48 ImGui.SetCursorPosX(width - 520);
48
49
49 if (Menu.activeButton("\ue0c2 Contracts", bridgeEngine.windowStatuses[Window.Contracts], new Num.Vector4(0.060f, 0.590f, 0.980f, 1f)))
50 if (Menu.activeButton("\ue0c2 Contracts", bridgeEngine.windowStatuses[Window.Contracts], StyleSet.selected))
50 {
51 {
51 Logging.Trace("Contracts toggled.");
52 Logging.Trace("Contracts toggled.");
52 Logging.Spy(bridgeEngine.windowStatuses, "statuses");
53 Logging.Spy(bridgeEngine.windowStatuses, "statuses");
53 bridgeEngine.typeMessages.Add(new ToggleWindowTypeMessage{Window = Window.Contracts});
54 bridgeEngine.typeMessages.Add(new ToggleWindowTypeMessage{Window = Window.Contracts});
54 }
55 }
55 //Budget isn't connected to an entity yet:
56 //Budget isn't connected to an entity yet:
56 if (Menu.activeButton("$ Budget", showBudget, new Num.Vector4(0.060f, 0.590f, 0.980f, 1f)))
57 if (Menu.activeButton("$ Budget", showBudget, StyleSet.selected))
57 {
58 {
58 bridgeEngine.typeMessages.Add(new ToggleWindowTypeMessage{Window = Window.Budget});
59 bridgeEngine.typeMessages.Add(new ToggleWindowTypeMessage{Window = Window.Budget});
59
60
60 }
61 }
61 if (Menu.activeButton("\ue124 Forest", bridgeEngine.windowStatuses[Window.Forest], new Num.Vector4(0.060f, 0.590f, 0.980f, 1f)))
62 if (Menu.activeButton("\ue124 Forest", bridgeEngine.windowStatuses[Window.Forest], StyleSet.selected))
62 {
63 {
63 bridgeEngine.typeMessages.Add(new ToggleWindowTypeMessage{Window = Window.Forest});
64 bridgeEngine.typeMessages.Add(new ToggleWindowTypeMessage{Window = Window.Forest});
64
65
65 }
66 }
66 if (Menu.activeButton("\ue0bf News", bridgeEngine.windowStatuses[Window.News], new Num.Vector4(0.060f, 0.590f, 0.980f, 1f)))
67 if (Menu.activeButton("\ue0bf News", bridgeEngine.windowStatuses[Window.News], StyleSet.selected))
67 {
68 {
68 bridgeEngine.typeMessages.Add(new ToggleWindowTypeMessage{Window = Window.News});
69 bridgeEngine.typeMessages.Add(new ToggleWindowTypeMessage{Window = Window.News});
69 }
70 }
70
71
71 ImGui.Text("|");
72 ImGui.Text("|");
72
73
73 if (Menu.activeButton("\ue0ac Pause", paused, new Num.Vector4(0.060f, 0.590f, 0.980f, 1f)))
74 if (Menu.activeButton("\ue0ac Pause", paused, StyleSet.selected ))
74 {
75 {
75 paused = !paused;
76 paused = !paused;
76 }
77 }
77 if (Menu.activeButton("1", (rate == 0), new Num.Vector4(0.060f, 0.590f, 0.980f, 1f)))
78 if (Menu.activeButton("1", (rate == 0), StyleSet.selected))
78 {
79 {
79 paused = false;
80 paused = false;
80 rate = 0;
81 rate = 0;
81 }
82 }
82 else if (Menu.activeButton("2", (rate == 1), new Num.Vector4(0.060f, 0.590f, 0.980f, 1f)))
83 else if (Menu.activeButton("2", (rate == 1), StyleSet.selected))
83 {
84 {
84 paused = false;
85 paused = false;
85 rate = 1;
86 rate = 1;
86 }
87 }
87 else if (Menu.activeButton("3", (rate == 2), new Num.Vector4(0.060f, 0.590f, 0.980f, 1f)))
88 else if (Menu.activeButton("3", (rate == 2), StyleSet.selected))
88 {
89 {
89 paused = false;
90 paused = false;
90 rate = 2;
91 rate = 2;
91 }
92 }
92 else if (Menu.activeButton("4", (rate == 3), new Num.Vector4(0.060f, 0.590f, 0.980f, 1f)))
93 else if (Menu.activeButton("4", (rate == 3), StyleSet.selected))
93 {
94 {
94 paused = false;
95 paused = false;
95 rate = 3;
96 rate = 3;
96 }
97 }
97 #if DEBUG
98 #if DEBUG
98 else if (Menu.activeButton("5", (rate == 4), new Num.Vector4(0.060f, 0.590f, 0.980f, 1f)))
99 else if (Menu.activeButton("5", (rate == 4), StyleSet.selected))
99 {
100 {
100 paused = false;
101 paused = false;
101 rate = 4;
102 rate = 4;
Show file before | Show file after | Show commentsHide comments
@@ -13,6 +13,9
13 public static Num.Vector4 black = new Num.Vector4(0f, 0f, 0f, 1f);
13 public static Num.Vector4 black = new Num.Vector4(0f, 0f, 0f, 1f);
14 public static Num.Vector4 white = new Num.Vector4(1f, 1f, 1f, 1f);
14 public static Num.Vector4 white = new Num.Vector4(1f, 1f, 1f, 1f);
15 public static Num.Vector4 title_bar = new Num.Vector4(0.65f, 0.65f, 0.65f, 1f);
15 public static Num.Vector4 title_bar = new Num.Vector4(0.65f, 0.65f, 0.65f, 1f);
16
17 // public static Num.Vector4 selected = new Num.Vector4(0.0f, 0.0f, 0.75f, 1f);
18 public static Num.Vector4 selected = new Num.Vector4(0.0f, 0.0f, 0.55f, 1f);
16 public static Dictionary<ImGuiStyleVar, float> defaultWindowVars = new Dictionary<ImGuiStyleVar, float>{
19 public static Dictionary<ImGuiStyleVar, float> defaultWindowVars = new Dictionary<ImGuiStyleVar, float>{
17 { ImGuiStyleVar.FrameRounding, 0.0f },
20 { ImGuiStyleVar.FrameRounding, 0.0f },
18 {ImGuiStyleVar.WindowRounding, 0.0f},
21 {ImGuiStyleVar.WindowRounding, 0.0f},
@@ -35,7 +38,7
35 {ImGuiCol.CheckMark, black},
38 {ImGuiCol.CheckMark, black},
36
39
37 {ImGuiCol.TitleBg, title_bar},
40 {ImGuiCol.TitleBg, title_bar},
38 {ImGuiCol.TitleBgActive, title_bar},
41 {ImGuiCol.TitleBgActive, selected},
39 {ImGuiCol.TitleBgCollapsed, title_bar},
42 {ImGuiCol.TitleBgCollapsed, title_bar},
40
43
41 {ImGuiCol.Border, black},
44 {ImGuiCol.Border, black},
You need to be logged in to leave comments. Login now