diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-01-27 17:54:12 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-01-27 17:54:12 +0300 |
| commit | f3cec08689d531cf6fe2c9edc733fa8b00032631 (patch) | |
| tree | 0426309dc747b7e2aa4b95b0832e1e4e0835d3df /src/gui/popups | |
| parent | 3a0d18fa8b8f6a78479fad7785491feff4f4f468 (diff) | |
| download | manaplus-f3cec08689d531cf6fe2c9edc733fa8b00032631.tar.gz manaplus-f3cec08689d531cf6fe2c9edc733fa8b00032631.tar.bz2 manaplus-f3cec08689d531cf6fe2c9edc733fa8b00032631.tar.xz manaplus-f3cec08689d531cf6fe2c9edc733fa8b00032631.zip | |
Move browserboxmode into separate file.
Also convert it to strong typed enum.
Diffstat (limited to 'src/gui/popups')
| -rw-r--r-- | src/gui/popups/popupmenu.cpp | 2 | ||||
| -rw-r--r-- | src/gui/popups/speechbubble.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 7e05e3f1f..846c29174 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -104,7 +104,7 @@ PopupMenu *popupMenu = nullptr; PopupMenu::PopupMenu() : Popup("PopupMenu", "popupmenu.xml"), - mBrowserBox(new BrowserBox(this, BrowserBox::AUTO_SIZE, Opaque_true, + mBrowserBox(new BrowserBox(this, BrowserBoxMode::AUTO_SIZE, Opaque_true, "popupbrowserbox.xml")), mScrollArea(nullptr), mBeingId(BeingId_zero), diff --git a/src/gui/popups/speechbubble.cpp b/src/gui/popups/speechbubble.cpp index c02802095..a76f8694c 100644 --- a/src/gui/popups/speechbubble.cpp +++ b/src/gui/popups/speechbubble.cpp @@ -39,7 +39,7 @@ SpeechBubble::SpeechBubble() : mText(), mSpacing(mSkin ? mSkin->getOption("spacing") : 2), mCaption(new Label(this)), - mSpeechBox(new BrowserBox(this, BrowserBox::AUTO_SIZE, Opaque_true, + mSpeechBox(new BrowserBox(this, BrowserBoxMode::AUTO_SIZE, Opaque_true, "speechbrowserbox.xml")) { setContentSize(140, 46); |