Description:
Small tweaks.
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
@@ -146,11 +146,6 | |||||
|
146 | #endif |
|
146 | #endif |
|
147 | #endregion gamerate_keys |
|
147 | #endregion gamerate_keys |
|
148 | #region misc_keys |
|
148 | #region misc_keys |
|
149 | if (keyboardCur.IsKeyDown(Keys.OemBackslash) && keyboardPrev.IsKeyUp(Keys.OemBackslash)) |
|
||
|
150 | { |
|
||
|
151 | SendMessage(new ToggleWindowTypeMessage{Window = Window.Debug}); |
|
||
|
152 |
|
|||
|
153 | } |
|
||
|
154 | if (keyboardCur.IsKeyDown(Keys.B) && keyboardPrev.IsKeyUp(Keys.B)) |
|
149 | if (keyboardCur.IsKeyDown(Keys.B) && keyboardPrev.IsKeyUp(Keys.B)) |
|
155 | { |
|
150 | { |
|
156 | SendMessage(new ToggleWindowTypeMessage{Window = Window.Budget}); |
|
151 | SendMessage(new ToggleWindowTypeMessage{Window = Window.Budget}); |
@@ -192,6 +187,12 | |||||
|
192 | } |
|
187 | } |
|
193 | } |
|
188 | } |
|
194 |
|
189 | ||
|
|
190 | if (keyboardCur.IsKeyDown(Keys.OemBackslash) && keyboardPrev.IsKeyUp(Keys.OemBackslash)) | ||
|
|
191 | { | ||
|
|
192 | SendMessage(new ToggleWindowTypeMessage{Window = Window.Debug}); | ||
|
|
193 | |||
|
|
194 | } | ||
|
|
195 | |||
|
195 | if (keyboardCur.IsKeyDown(Keys.Q) && keyboardPrev.IsKeyUp(Keys.Q)) |
|
196 | if (keyboardCur.IsKeyDown(Keys.Q) && keyboardPrev.IsKeyUp(Keys.Q)) |
|
196 | { |
|
197 | { |
|
197 | System.Console.WriteLine("Quitting"); |
|
198 | System.Console.WriteLine("Quitting"); |
@@ -856,7 +856,6 | |||||
|
856 |
|
856 | ||
|
857 | Vector2 middle_dimensions = largeMonoFont.MeasureString("Isometric Park"); |
|
857 | Vector2 middle_dimensions = largeMonoFont.MeasureString("Isometric Park"); |
|
858 | float middle_start = (int)((FNAGame.width / 2) - (middle_dimensions.X / 2)); |
|
858 | float middle_start = (int)((FNAGame.width / 2) - (middle_dimensions.X / 2)); |
|
859 | // ImGui.SetNextWindowPos(new Num.Vector2(((FNAGame.width/2) - 40), 200)); |
|
||
|
860 | batch.DrawString(largeMonoFont, "Isometric Park", |
|
859 | batch.DrawString(largeMonoFont, "Isometric Park", |
|
861 | new Vector2(middle_start, 50), |
|
860 | new Vector2(middle_start, 50), |
|
862 | Color.Black, 0.0f, Vector2.Zero, |
|
861 | Color.Black, 0.0f, Vector2.Zero, |
@@ -99,7 +99,7 | |||||
|
99 |
|
99 | ||
|
100 | break; |
|
100 | break; |
|
101 | case Window.MainMenu: |
|
101 | case Window.MainMenu: |
|
102 | MainMenu.Render(this.BridgeEngine.font, this.BridgeEngine); |
|
102 | MainMenu.Render(this.BridgeEngine.font, this.BridgeEngine, width); |
|
103 | break; |
|
103 | break; |
|
104 | case Window.InGameMenu: |
|
104 | case Window.InGameMenu: |
|
105 | InGameMenu.Render(this.BridgeEngine.font, this.BridgeEngine, width); |
|
105 | InGameMenu.Render(this.BridgeEngine.font, this.BridgeEngine, width); |
@@ -13,7 +13,7 | |||||
|
13 | public static class MainMenu |
|
13 | public static class MainMenu |
|
14 | { |
|
14 | { |
|
15 |
|
15 | ||
|
16 | public static void Render(ImFontPtr font, ImGuiWindowBridgeEngine bridgeEngine) |
|
16 | public static void Render(ImFontPtr font, ImGuiWindowBridgeEngine bridgeEngine, int width) |
|
17 | { |
|
17 | { |
|
18 | //Has to go first so the measurement is correct: |
|
18 | //Has to go first so the measurement is correct: |
|
19 | ImGui.PushFont(font); |
|
19 | ImGui.PushFont(font); |
@@ -28,6 +28,8 | |||||
|
28 |
|
28 | ||
|
29 | StyleSets.defaultSet.push(); |
|
29 | StyleSets.defaultSet.push(); |
|
30 |
|
30 | ||
|
|
31 | ImGui.SetNextWindowPos(new Num.Vector2(((width/2) - 40), 200)); | ||
|
|
32 | |||
|
31 | ImGui.Begin("##Toolbar", ref newShow, ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoSavedSettings | ImGuiWindowFlags.NoTitleBar); |
|
33 | ImGui.Begin("##Toolbar", ref newShow, ImGuiWindowFlags.AlwaysAutoResize | ImGuiWindowFlags.NoResize | ImGuiWindowFlags.NoCollapse | ImGuiWindowFlags.NoSavedSettings | ImGuiWindowFlags.NoTitleBar); |
|
32 |
|
34 | ||
|
33 | if (ImGui.Button("New Game", button_size)) |
|
35 | if (ImGui.Button("New Game", button_size)) |
@@ -142,13 +142,13 | |||||
|
142 |
|
142 | ||
|
143 | ImGui.SameLine(); |
|
143 | ImGui.SameLine(); |
|
144 |
|
144 | ||
|
145 |
if (ImGui.Button(" |
|
145 | if (ImGui.Button("Custom Title...")) |
|
146 | { |
|
146 | { |
|
147 | NewGameWindow.showModal = true; |
|
147 | NewGameWindow.showModal = true; |
|
148 |
ImGui.OpenPopup(" |
|
148 | ImGui.OpenPopup("Custom"); |
|
149 |
|
149 | ||
|
150 | } |
|
150 | } |
|
151 |
if (ImGui.BeginPopup(" |
|
151 | if (ImGui.BeginPopup("Custom" /*, ref showModal*/)) |
|
152 | { |
|
152 | { |
|
153 | int newCustomTitlePos = NewGameWindow.customTitlePos; |
|
153 | int newCustomTitlePos = NewGameWindow.customTitlePos; |
|
154 | unsafe { |
|
154 | unsafe { |
You need to be logged in to leave comments.
Login now