Description:
Fix bug in News window.
Commit status:
[Not Reviewed]
References:
Diff options:
Comments:
0 Commit comments
0 Inline Comments
Unresolved TODOs:
There are no unresolved TODOs
@@ -39,8 +39,7 | |||||
|
39 | if ((mouseCur.LeftButton == ButtonState.Released) |
|
39 | if ((mouseCur.LeftButton == ButtonState.Released) |
|
40 | && (mousePrev.LeftButton == ButtonState.Pressed) |
|
40 | && (mousePrev.LeftButton == ButtonState.Pressed) |
|
41 | && MathUtils.BetweenExclusive(mouseCur.X, width+x-20, width+x) |
|
41 | && MathUtils.BetweenExclusive(mouseCur.X, width+x-20, width+x) |
|
42 | && MathUtils.BetweenExclusive(mouseCur.Y, y+bar_height, y+bar_height+20) |
|
42 | && MathUtils.BetweenExclusive(mouseCur.Y, y+bar_height, y+bar_height+20)) { |
|
43 | ) { |
|
||
|
44 |
|
43 | ||
|
45 | return false; |
|
44 | return false; |
|
46 |
|
45 |
@@ -113,7 +113,6 | |||||
|
113 | } |
|
113 | } |
|
114 | ImGui.EndTabItem(); |
|
114 | ImGui.EndTabItem(); |
|
115 | } |
|
115 | } |
|
116 | ImGui.EndTabItem(); |
|
||
|
117 | if (ImGui.BeginTabItem("The Naturalist")) |
|
116 | if (ImGui.BeginTabItem("The Naturalist")) |
|
118 | { |
|
117 | { |
|
119 | foreach (NewsItem story in content.Where(s => (s.source == "Arborist")).Take(3)) |
|
118 | foreach (NewsItem story in content.Where(s => (s.source == "Arborist")).Take(3)) |
@@ -138,10 +137,9 | |||||
|
138 | } |
|
137 | } |
|
139 | ImGui.EndTabItem(); |
|
138 | ImGui.EndTabItem(); |
|
140 | } |
|
139 | } |
|
|
140 | ImGui.EndTabBar(); | ||
|
141 | } |
|
141 | } |
|
142 |
|
142 | ||
|
143 | ImGui.EndTabBar(); |
|
||
|
144 |
|
|||
|
145 |
|
143 | ||
|
146 | if (ImGui.Button("Okay")) |
|
144 | if (ImGui.Button("Okay")) |
|
147 | { |
|
145 | { |
@@ -34,8 +34,8 | |||||
|
34 | {ImGuiCol.FrameBg, grey}, |
|
34 | {ImGuiCol.FrameBg, grey}, |
|
35 | {ImGuiCol.FrameBgHovered, grey}, |
|
35 | {ImGuiCol.FrameBgHovered, grey}, |
|
36 | {ImGuiCol.Header, darkgrey}, |
|
36 | {ImGuiCol.Header, darkgrey}, |
|
37 |
{ImGuiCol.HeaderHovered, |
|
37 | {ImGuiCol.HeaderHovered, grey}, |
|
38 |
{ImGuiCol.HeaderActive, |
|
38 | {ImGuiCol.HeaderActive, grey}, |
|
39 | {ImGuiCol.ButtonHovered, grey}, |
|
39 | {ImGuiCol.ButtonHovered, grey}, |
|
40 | {ImGuiCol.ButtonActive, darkgrey}, |
|
40 | {ImGuiCol.ButtonActive, darkgrey}, |
|
41 | {ImGuiCol.SliderGrab, darkgrey}, |
|
41 | {ImGuiCol.SliderGrab, darkgrey}, |
You need to be logged in to leave comments.
Login now