summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2018-06-16 20:12:49 +0200
committerNathanael Sensfelder <SpamShield0@MultiAgentSystems.org>2018-06-16 20:12:49 +0200
commitd52e2954b044624365fed3dcddc574b562d8b96a (patch)
tree562b6fbba51cf084bfa8cb66b5c5d492c0b0359d
parentcb496ae0c7e163721e103d9b6a6f801013d82066 (diff)
...
-rw-r--r--src/battlemap/src/ElmModule/View.elm2
-rw-r--r--src/battlemap/src/View/MainMenu.elm17
-rw-r--r--src/battlemap/src/View/SubMenu.elm6
3 files changed, 11 insertions, 14 deletions
diff --git a/src/battlemap/src/ElmModule/View.elm b/src/battlemap/src/ElmModule/View.elm
index b2c4d66..90177be 100644
--- a/src/battlemap/src/ElmModule/View.elm
+++ b/src/battlemap/src/ElmModule/View.elm
@@ -31,7 +31,7 @@ view model =
(Html.Attributes.class "fullscreen-module")
]
[
- (View.MainMenu.get_html model),
+ (View.MainMenu.get_html),
(Html.Lazy.lazy2
(View.Controlled.get_html)
model.char_turn
diff --git a/src/battlemap/src/View/MainMenu.elm b/src/battlemap/src/View/MainMenu.elm
index e7a3606..f92f73a 100644
--- a/src/battlemap/src/View/MainMenu.elm
+++ b/src/battlemap/src/View/MainMenu.elm
@@ -14,33 +14,26 @@ import Struct.UI
-- LOCAL -----------------------------------------------------------------------
--------------------------------------------------------------------------------
get_menu_button_html : (
- (Maybe Struct.UI.Tab) ->
Struct.UI.Tab ->
(Html.Html Struct.Event.Type)
)
-get_menu_button_html selected_tab tab =
+get_menu_button_html tab =
(Html.button
--- (
--- if ((Just tab) == selected_tab)
--- then
--- [ (Html.Attributes.disabled True) ]
--- else
- [ (Html.Events.onClick (Struct.Event.TabSelected tab)) ]
--- )
+ [ (Html.Events.onClick (Struct.Event.TabSelected tab)) ]
[ (Html.text (Struct.UI.to_string tab)) ]
)
--------------------------------------------------------------------------------
-- EXPORTED --------------------------------------------------------------------
--------------------------------------------------------------------------------
-get_html : Struct.Model.Type -> (Html.Html Struct.Event.Type)
-get_html model =
+get_html : (Html.Html Struct.Event.Type)
+get_html =
(Html.div
[
(Html.Attributes.class "battlemap-main-menu")
]
(List.map
- (get_menu_button_html (Struct.UI.try_getting_displayed_tab model.ui))
+ (get_menu_button_html)
(Struct.UI.get_all_tabs)
)
)
diff --git a/src/battlemap/src/View/SubMenu.elm b/src/battlemap/src/View/SubMenu.elm
index db7f44f..9e87b6e 100644
--- a/src/battlemap/src/View/SubMenu.elm
+++ b/src/battlemap/src/View/SubMenu.elm
@@ -36,7 +36,11 @@ get_inner_html model tab =
(View.SubMenu.Status.get_html model)
Struct.UI.CharactersTab ->
- (View.SubMenu.Characters.get_html model.characters model.player_id)
+ (Html.Lazy.lazy2
+ (View.SubMenu.Characters.get_html)
+ model.characters
+ model.player_id
+ )
Struct.UI.SettingsTab ->
(View.SubMenu.Settings.get_html model)