games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-26 03:52:01 +02:00
Code Issues Releases Activity

vcmi: name infobar height and width

Browse Source
This commit is contained in:
Konstantin 2023-03-07 03:28:25 +03:00
parent da8840c499
commit 75358a68a7
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/adventureMap/CAdvMapInt.cpp
View File

@ -86,7 +86,7 @@ CAdvMapInt::CAdvMapInt():
statusbar(CGStatusBar::create(ADVOPT.statusbarX,ADVOPT.statusbarY,ADVOPT.statusbarG)), statusbar(CGStatusBar::create(ADVOPT.statusbarX,ADVOPT.statusbarY,ADVOPT.statusbarG)),
heroList(new CHeroList(ADVOPT.hlistSize, Point(ADVOPT.hlistX, ADVOPT.hlistY), ADVOPT.hlistAU, ADVOPT.hlistAD)), heroList(new CHeroList(ADVOPT.hlistSize, Point(ADVOPT.hlistX, ADVOPT.hlistY), ADVOPT.hlistAU, ADVOPT.hlistAD)),
townList(new CTownList(ADVOPT.tlistSize, Point(ADVOPT.tlistX, ADVOPT.tlistY), ADVOPT.tlistAU, ADVOPT.tlistAD)), townList(new CTownList(ADVOPT.tlistSize, Point(ADVOPT.tlistX, ADVOPT.tlistY), ADVOPT.tlistAU, ADVOPT.tlistAD)),
infoBar(new CInfoBar(Rect(ADVOPT.infoboxX, ADVOPT.infoboxY, 192, 192))), infoBar(new CInfoBar(Point(ADVOPT.infoboxX, ADVOPT.infoboxY))),
resdatabar(new CResDataBar), resdatabar(new CResDataBar),
mapAudio(new MapAudioPlayer()), mapAudio(new MapAudioPlayer()),
terrain(new MapView(Point(ADVOPT.advmapX, ADVOPT.advmapY), Point(ADVOPT.advmapW, ADVOPT.advmapH))), terrain(new MapView(Point(ADVOPT.advmapX, ADVOPT.advmapY), Point(ADVOPT.advmapW, ADVOPT.advmapH))),

4
client/adventureMap/CInfoBar.cpp
View File

@ -279,6 +279,10 @@ CInfoBar::CInfoBar(const Rect & position)
reset(); reset();
} }
CInfoBar::CInfoBar(const Point & position): CInfoBar(Rect(position.x, position.y, width, height))
{
}
void CInfoBar::showDate() void CInfoBar::showDate()
{ {
OBJECT_CONSTRUCTION_CUSTOM_CAPTURING(255-DISPOSE); OBJECT_CONSTRUCTION_CUSTOM_CAPTURING(255-DISPOSE);

8
client/adventureMap/CInfoBar.h
View File

@ -32,6 +32,13 @@ class CTextBox;
/// Info box which shows next week/day information, hold the current date /// Info box which shows next week/day information, hold the current date
class CInfoBar : public CIntObject class CInfoBar : public CIntObject
{ {
private:
/// Infobar actually have a fixed size
/// Declare before to compute correct size of widgets
static constexpr int width = 192;
static constexpr int height = 192;
static constexpr int component_offset = 8;
//all visible information located in one object - for ease of replacing //all visible information located in one object - for ease of replacing
class CVisibleInfo : public CIntObject class CVisibleInfo : public CIntObject
{ {
@ -124,6 +131,7 @@ class CInfoBar : public CIntObject
void playNewDaySound(); void playNewDaySound();
public: public:
CInfoBar(const Rect & pos); CInfoBar(const Rect & pos);
CInfoBar(const Point & pos);
/// show new day/week animation /// show new day/week animation
void showDate(); void showDate();