krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

fixed the mouse cursors and fixed MWAttribute & MWSkill

Browse source
This commit is contained in:
scrawl 2012-03-21 16:07:56 +01:00
parent 2f662a226c
commit 9b31b6272f
4 changed files with 63 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
apps/openmw/mwgui/widgets.cpp
View file

@ -101,12 +101,19 @@ void MWSkill::initialiseOverride()
MyGUI::ButtonPtr button; MyGUI::ButtonPtr button;
assignWidget(button, "StatNameButton"); assignWidget(button, "StatNameButton");
//skillNameWidget = button; // ??? if (button)
button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWSkill::onClicked); {
skillNameWidget = button;
button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWSkill::onClicked);
}
assignWidget(button, "StatValue"); button = 0;
//skillNameWidget = button; // ??? assignWidget(button, "StatValueButton");
button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWSkill::onClicked); if (button)
{
skillNameWidget = button;
button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWSkill::onClicked);
}
} }
/* MWAttribute */ /* MWAttribute */
@ -183,16 +190,22 @@ void MWAttribute::initialiseOverride()
assignWidget(attributeNameWidget, "StatName"); assignWidget(attributeNameWidget, "StatName");
assignWidget(attributeValueWidget, "StatValue"); assignWidget(attributeValueWidget, "StatValue");
MyGUI::ButtonPtr button; MyGUI::ButtonPtr button;
assignWidget(button, "StatNameButton"); assignWidget(button, "StatNameButton");
//attributeNameWidget = button; // ??? if (button)
button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWAttribute::onClicked); {
attributeNameWidget = button;
assignWidget(button, "StatValue"); button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWAttribute::onClicked);
//attributeNameWidget = button; // ??? }
button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWAttribute::onClicked);
button = 0;
assignWidget(button, "StatValueButton");
if (button)
{
attributeValueWidget = button;
button->eventMouseButtonClick += MyGUI::newDelegate(this, &MWAttribute::onClicked);
}
} }
/* MWSpell */ /* MWSpell */

2
extern/mygui_3.0.1/CMakeLists.txt vendored
View file

@ -11,6 +11,8 @@ configure_file("${SDIR}/core.skin" "${DDIR}/core.skin" COPYONLY)
configure_file("${SDIR}/core.xml" "${DDIR}/core.xml" COPYONLY) configure_file("${SDIR}/core.xml" "${DDIR}/core.xml" COPYONLY)
configure_file("${SDIR}/mwpointer.png" "${DDIR}/mwpointer.png" COPYONLY) configure_file("${SDIR}/mwpointer.png" "${DDIR}/mwpointer.png" COPYONLY)
configure_file("${SDIR}/mwgui.png" "${DDIR}/mwgui.png" COPYONLY) configure_file("${SDIR}/mwgui.png" "${DDIR}/mwgui.png" COPYONLY)
configure_file("${SDIR}/openmw_images.xml" "${DDIR}/openmw_images.xml" COPYONLY)
configure_file("${SDIR}/openmw_settings.xml" "${DDIR}/openmw_settings.xml" COPYONLY)
configure_file("${SDIR}/openmw_box.skin.xml" "${DDIR}/openmw_box.skin.xml" COPYONLY) configure_file("${SDIR}/openmw_box.skin.xml" "${DDIR}/openmw_box.skin.xml" COPYONLY)
configure_file("${SDIR}/openmw_button.skin.xml" "${DDIR}/openmw_button.skin.xml" COPYONLY) configure_file("${SDIR}/openmw_button.skin.xml" "${DDIR}/openmw_button.skin.xml" COPYONLY)
configure_file("${SDIR}/openmw_list.skin.xml" "${DDIR}/openmw_list.skin.xml" COPYONLY) configure_file("${SDIR}/openmw_list.skin.xml" "${DDIR}/openmw_list.skin.xml" COPYONLY)

19
extern/mygui_3.0.1/openmw_resources/core.xml vendored
View file

@ -2,13 +2,13 @@
<MyGUI> <MyGUI>
<MyGUI type="List"> <MyGUI type="List">
<List file="core.skin" group="General"/> <List file="core.skin" group="General"/>
<List file="openmw_images.xml" group="General"/>
<List file="openmw_layers.xml" group="General"/> <List file="openmw_layers.xml" group="General"/>
<List file="openmw.pointer.xml" group="General"/> <List file="openmw.pointer.xml" group="General"/>
<List file="openmw.font.xml" group="General"/> <List file="openmw.font.xml" group="General"/>
<List file="openmw_text.skin.xml" group="General"/> <List file="openmw_text.skin.xml" group="General"/>
<List file="openmw_windows.skin.xml" group="General"/> <List file="openmw_windows.skin.xml" group="General"/>
<List file="openmw_button.skin.xml" group="General"/> <List file="openmw_button.skin.xml" group="General"/>
<List file="openmw_list.skin.xml" group="General"/> <List file="openmw_list.skin.xml" group="General"/>
@ -20,7 +20,8 @@
<List file="openmw_mainmenu_skin.xml" group="General"/> <List file="openmw_mainmenu_skin.xml" group="General"/>
<List file="openmw_console.skin.xml" group="General"/> <List file="openmw_console.skin.xml" group="General"/>
<List file="openmw_journal_skin.xml" group="General"/> <List file="openmw_journal_skin.xml" group="General"/>
<List file="openmw_dialogue_window_skin.xml" group="General"/> <List file="openmw_dialogue_window_skin.xml" group="General"/>
</MyGUI> <List file="openmw_settings.xml" group="General"/>
</MyGUI>
</MyGUI> </MyGUI>

36
extern/mygui_3.0.1/openmw_resources/openmw.pointer.xml vendored
View file

@ -1,13 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<MyGUI type="Pointer"> <MyGUI type="Resource">
<Resource type="ResourceImageSetPointer" name="arrow">
<Pointer layer="Pointer" texture="mwpointer.png" default="arrow"> <Property key="Point" value="7 0"/>
<Info name="arrow" point="7 0" size="32 32" offset="0 0 32 32"/> <Property key="Size" value="32 32"/>
<Info name="hresize" point="16 14" size="32 32" offset="32 0 32 32"/> <Property key="Resource" value="ArrowPointerImage"/>
<Info name="vresize" point="17 16" size="32 32" offset="0 32 32 32"/> </Resource>
<Info name="dresize" point="17 15" size="32 32" offset="32 32 32 32"/> <Resource type="ResourceImageSetPointer" name="hresize">
<Info name="dresize2" point="15 15" size="32 32" offset="64 32 32 32"/> <Property key="Point" value="16 14"/>
</Pointer> <Property key="Size" value="32 32"/>
<Property key="Resource" value="HResizePointerImage"/>
</Resource>
<Resource type="ResourceImageSetPointer" name="vresize">
<Property key="Point" value="17 16"/>
<Property key="Size" value="32 32"/>
<Property key="Resource" value="VResizePointerImage"/>
</Resource>
<Resource type="ResourceImageSetPointer" name="dresize">
<Property key="Point" value="17 15"/>
<Property key="Size" value="32 32"/>
<Property key="Resource" value="DResizePointerImage"/>
</Resource>
<Resource type="ResourceImageSetPointer" name="dresize2">
<Property key="Point" value="15 15"/>
<Property key="Size" value="32 32"/>
<Property key="Resource" value="DResize2PointerImage"/>
</Resource>
</MyGUI> </MyGUI>