From ba307a72cb8bcfe068e362fab4a5e572d9ac65e9 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Thu, 21 May 2015 21:31:34 +0300 Subject: Call Popup::postInit from all popups with overrided postInit method. --- src/gui/popups/beingpopup.cpp | 1 + src/gui/popups/itempopup.cpp | 1 + src/gui/popups/popupmenu.cpp | 1 + src/gui/popups/skillpopup.cpp | 1 + src/gui/popups/speechbubble.cpp | 1 + src/gui/popups/spellpopup.cpp | 1 + src/gui/popups/statuspopup.cpp | 1 + src/gui/popups/textboxpopup.cpp | 1 + src/gui/popups/textpopup.cpp | 1 + 9 files changed, 9 insertions(+) (limited to 'src/gui') diff --git a/src/gui/popups/beingpopup.cpp b/src/gui/popups/beingpopup.cpp index 0592189aa..16a60150a 100644 --- a/src/gui/popups/beingpopup.cpp +++ b/src/gui/popups/beingpopup.cpp @@ -92,6 +92,7 @@ BeingPopup::~BeingPopup() void BeingPopup::postInit() { + Popup::postInit(); add(mBeingName); add(mBeingParty); add(mBeingGuild); diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp index 3a144a3c7..ad0628afa 100644 --- a/src/gui/popups/itempopup.cpp +++ b/src/gui/popups/itempopup.cpp @@ -86,6 +86,7 @@ ItemPopup::ItemPopup() : void ItemPopup::postInit() { + Popup::postInit(); add(mItemName); add(mItemDesc); add(mItemEffect); diff --git a/src/gui/popups/popupmenu.cpp b/src/gui/popups/popupmenu.cpp index 4f00d6050..7bf1aa5a6 100644 --- a/src/gui/popups/popupmenu.cpp +++ b/src/gui/popups/popupmenu.cpp @@ -130,6 +130,7 @@ PopupMenu::PopupMenu() : void PopupMenu::postInit() { + Popup::postInit(); add(mScrollArea); } diff --git a/src/gui/popups/skillpopup.cpp b/src/gui/popups/skillpopup.cpp index 1c2bc2c18..8a6f26b26 100644 --- a/src/gui/popups/skillpopup.cpp +++ b/src/gui/popups/skillpopup.cpp @@ -61,6 +61,7 @@ SkillPopup::SkillPopup() : void SkillPopup::postInit() { + Popup::postInit(); add(mSkillName); add(mSkillDesc); add(mSkillEffect); diff --git a/src/gui/popups/speechbubble.cpp b/src/gui/popups/speechbubble.cpp index 47e71e269..c91b41370 100644 --- a/src/gui/popups/speechbubble.cpp +++ b/src/gui/popups/speechbubble.cpp @@ -54,6 +54,7 @@ SpeechBubble::SpeechBubble() : void SpeechBubble::postInit() { + Popup::postInit(); add(mCaption); add(mSpeechBox); } diff --git a/src/gui/popups/spellpopup.cpp b/src/gui/popups/spellpopup.cpp index b451f15fc..8e901cfb9 100644 --- a/src/gui/popups/spellpopup.cpp +++ b/src/gui/popups/spellpopup.cpp @@ -47,6 +47,7 @@ SpellPopup::SpellPopup() : void SpellPopup::postInit() { + Popup::postInit(); add(mItemName); add(mItemComment); diff --git a/src/gui/popups/statuspopup.cpp b/src/gui/popups/statuspopup.cpp index b4652fb04..17894f04c 100644 --- a/src/gui/popups/statuspopup.cpp +++ b/src/gui/popups/statuspopup.cpp @@ -54,6 +54,7 @@ StatusPopup::StatusPopup() : void StatusPopup::postInit() { + Popup::postInit(); const int fontHeight = getFont()->getHeight(); int y = 0; addLabel(0); diff --git a/src/gui/popups/textboxpopup.cpp b/src/gui/popups/textboxpopup.cpp index f464fa885..1d8d85a14 100644 --- a/src/gui/popups/textboxpopup.cpp +++ b/src/gui/popups/textboxpopup.cpp @@ -39,6 +39,7 @@ TextBoxPopup::TextBoxPopup() : void TextBoxPopup::postInit() { + Popup::postInit(); const int fontHeight = getFont()->getHeight(); setMinHeight(fontHeight); mTextBox->setEditable(false); diff --git a/src/gui/popups/textpopup.cpp b/src/gui/popups/textpopup.cpp index e8556bbcb..8387e394d 100644 --- a/src/gui/popups/textpopup.cpp +++ b/src/gui/popups/textpopup.cpp @@ -39,6 +39,7 @@ TextPopup::TextPopup() : void TextPopup::postInit() { + Popup::postInit(); const int fontHeight = getFont()->getHeight(); int y = 0; for (int f = 0; f < TEXTPOPUPCOUNT; f ++) -- cgit v1.2.3-60-g2f50