diff --git a/apps/openmw/mwgui/layouts.hpp b/apps/openmw/mwgui/layouts.hpp index 058aac6a5..13f80badc 100644 --- a/apps/openmw/mwgui/layouts.hpp +++ b/apps/openmw/mwgui/layouts.hpp @@ -71,6 +71,8 @@ namespace MWGui // Obviously you should override this later on setCellName("No Cell Loaded"); + + getWidget(mMap, "Map"); } void setCellName(const std::string& cellName) @@ -103,6 +105,7 @@ namespace MWGui private: std::string mPrefix; + MyGUI::ScrollView* mMap; }; class MainMenu : public OEngine::GUI::Layout diff --git a/files/mygui/CMakeLists.txt b/files/mygui/CMakeLists.txt index 9ea84747c..9a6cde7ba 100644 --- a/files/mygui/CMakeLists.txt +++ b/files/mygui/CMakeLists.txt @@ -42,6 +42,7 @@ configure_file("${SDIR}/openmw_layers.xml" "${DDIR}/openmw_layers.xml" COPYONLY) configure_file("${SDIR}/openmw_mainmenu_layout.xml" "${DDIR}/openmw_mainmenu_layout.xml" COPYONLY) configure_file("${SDIR}/openmw_mainmenu_skin.xml" "${DDIR}/openmw_mainmenu_skin.xml" COPYONLY) configure_file("${SDIR}/openmw_map_window_layout.xml" "${DDIR}/openmw_map_window_layout.xml" COPYONLY) +configure_file("${SDIR}/openmw_map_window_skin.xml" "${DDIR}/openmw_map_window_skin.xml" COPYONLY) configure_file("${SDIR}/openmw.pointer.xml" "${DDIR}/openmw.pointer.xml" COPYONLY) configure_file("${SDIR}/openmw_progress.skin.xml" "${DDIR}/openmw_progress.skin.xml" COPYONLY) configure_file("${SDIR}/openmw_stats_window_layout.xml" "${DDIR}/openmw_stats_window_layout.xml" COPYONLY) diff --git a/files/mygui/core.xml b/files/mygui/core.xml index 30e01a8f3..5bec13aef 100644 --- a/files/mygui/core.xml +++ b/files/mygui/core.xml @@ -20,6 +20,7 @@ + diff --git a/files/mygui/openmw_map_window_layout.xml b/files/mygui/openmw_map_window_layout.xml index 2b0d4b2ac..1bb304455 100644 --- a/files/mygui/openmw_map_window_layout.xml +++ b/files/mygui/openmw_map_window_layout.xml @@ -2,50 +2,49 @@ - - - - - - + + - + - + - + - + - + - + - + - + - + + + + diff --git a/files/mygui/openmw_map_window_skin.xml b/files/mygui/openmw_map_window_skin.xml new file mode 100644 index 000000000..452177464 --- /dev/null +++ b/files/mygui/openmw_map_window_skin.xml @@ -0,0 +1,11 @@ + + + + + + + + + + +