alysbrooks-public » games » isometric-park-fna

Commit r513:fb04f8102385 public

parent | child
Description:
Fix bug in Options window. Options window was crashing, possibly due to an ImGui upgrade.
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

r513:fb04f8102385 -

Show file before | Show file after | Show commentsHide comments
@@ -129,6 +129,23
129 ImGui.SameLine();
129 ImGui.SameLine();
130 ImGui.RadioButton("100 years", ref GraphWindow.year, 100);
130 ImGui.RadioButton("100 years", ref GraphWindow.year, 100);
131
131
132 ImGui.Text("Trees:");
133 for (int i = 0; i < tree_series.Length; i++)
134 {
135 var key = tree_series[i];
136 if (Menu.activeButton(key, data_sets_show[key], StyleSets.selected, StyleSets.white))
137 {
138 data_sets_show[key] = !data_sets_show[key];
139 }
140
141 if (i != tree_series.Length-1)
142 {
143 ImGui.SameLine();
144 }
145
146 }
147
148 ImGui.Text("Money:");
132 for (int i = 0; i < money_series.Length; i++)
149 for (int i = 0; i < money_series.Length; i++)
133 {
150 {
134 var key = money_series[i];
151 var key = money_series[i];
@@ -141,15 +158,6
141 }
158 }
142
159
143 }
160 }
144 foreach (var key in tree_series)
145 {
146 if (Menu.activeButton(key, data_sets_show[key], StyleSets.selected, StyleSets.white))
147 {
148 data_sets_show[key] = !data_sets_show[key];
149 }
150 ImGui.SameLine();
151
152 }
153
161
154
162
155
163
Show file before | Show file after | Show commentsHide comments
@@ -62,7 +62,7
62
62
63 ImGui.SameLine();
63 ImGui.SameLine();
64
64
65 if (ImGui.BeginCombo("", string.Format("{0}x{1}",
65 if (ImGui.BeginCombo("##resolutions", string.Format("{0}x{1}",
66 newResolution.X, newResolution.Y)))
66 newResolution.X, newResolution.Y)))
67 {
67 {
68
68
You need to be logged in to leave comments. Login now