mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-19 22:53:50 +00:00
Code Issues Releases Wiki Activity

Merchant repair and travel window scroll fix

Browse source
This commit is contained in:
Andrei Kortunov 2017-04-23 09:14:32 +04:00
parent bc9080d9d7
commit c2706ac3e7
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/openmw/mwgui/merchantrepair.cpp
View file

@ -21,6 +21,7 @@
namespace MWGui namespace MWGui
{ {
const int MerchantRepair::sLineHeight = 18;
MerchantRepair::MerchantRepair() MerchantRepair::MerchantRepair()
: WindowBase("openmw_merchantrepair.layout") : WindowBase("openmw_merchantrepair.layout")
@ -79,16 +80,16 @@ void MerchantRepair::startRepair(const MWWorld::Ptr &actor)
0, 0,
currentY, currentY,
0, 0,
18, sLineHeight,
MyGUI::Align::Default MyGUI::Align::Default
); );
currentY += 18; currentY += sLineHeight;
button->setUserString("Price", MyGUI::utility::toString(price)); button->setUserString("Price", MyGUI::utility::toString(price));
button->setUserData(MWWorld::Ptr(*iter)); button->setUserData(MWWorld::Ptr(*iter));
button->setCaptionWithReplacing(name); button->setCaptionWithReplacing(name);
button->setSize(button->getTextSize().width,18); button->setSize(mList->getWidth(),sLineHeight);
button->eventMouseWheel += MyGUI::newDelegate(this, &MerchantRepair::onMouseWheel); button->eventMouseWheel += MyGUI::newDelegate(this, &MerchantRepair::onMouseWheel);
button->setUserString("ToolTipType", "ItemPtr"); button->setUserString("ToolTipType", "ItemPtr");
button->eventMouseButtonClick += MyGUI::newDelegate(this, &MerchantRepair::onRepairButtonClick); button->eventMouseButtonClick += MyGUI::newDelegate(this, &MerchantRepair::onRepairButtonClick);

1
apps/openmw/mwgui/merchantrepair.hpp
View file

@ -30,6 +30,7 @@ protected:
void onRepairButtonClick(MyGUI::Widget* sender); void onRepairButtonClick(MyGUI::Widget* sender);
void onOkButtonClick(MyGUI::Widget* sender); void onOkButtonClick(MyGUI::Widget* sender);
static const int sLineHeight;
}; };
} }

2
apps/openmw/mwgui/travelwindow.cpp
View file

@ -94,7 +94,7 @@ namespace MWGui
toAdd->setUserString("price",oss.str()); toAdd->setUserString("price",oss.str());
toAdd->setCaptionWithReplacing("#{sCell=" + name + "} - " + MyGUI::utility::toString(price)+"#{sgp}"); toAdd->setCaptionWithReplacing("#{sCell=" + name + "} - " + MyGUI::utility::toString(price)+"#{sgp}");
toAdd->setSize(toAdd->getTextSize().width,sLineHeight); toAdd->setSize(mDestinationsView->getWidth(),sLineHeight);
toAdd->eventMouseWheel += MyGUI::newDelegate(this, &TravelWindow::onMouseWheel); toAdd->eventMouseWheel += MyGUI::newDelegate(this, &TravelWindow::onMouseWheel);
toAdd->setUserString("Destination", name); toAdd->setUserString("Destination", name);
toAdd->setUserData(pos); toAdd->setUserData(pos);