summaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-05-14 15:54:26 +0300
committerAndrei Karas <akaras@inbox.ru>2014-05-14 15:54:26 +0300
commit949deb1d666cf3b5cfe9e52259bd92ab6b07951f (patch)
treee311bed0210a409010f781df77ff3e5e1b334350 /src/gui
parent5781d238e97689be482c5ac691143ce35e3e278e (diff)
downloadplus-949deb1d666cf3b5cfe9e52259bd92ab6b07951f.tar.gz
plus-949deb1d666cf3b5cfe9e52259bd92ab6b07951f.tar.bz2
plus-949deb1d666cf3b5cfe9e52259bd92ab6b07951f.tar.xz
plus-949deb1d666cf3b5cfe9e52259bd92ab6b07951f.zip
Move linepart into separate file.
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/widgets/browserbox.cpp7
-rw-r--r--src/gui/widgets/browserbox.h42
-rw-r--r--src/gui/widgets/linepart.cpp33
-rw-r--r--src/gui/widgets/linepart.h75
4 files changed, 109 insertions, 48 deletions
diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp
index 30b06e266..dc5bf1700 100644
--- a/src/gui/widgets/browserbox.cpp
+++ b/src/gui/widgets/browserbox.cpp
@@ -910,10 +910,3 @@ void BrowserBox::setForegroundColorAll(const Color &color1,
mForegroundColor = color1;
mForegroundColor2 = color2;
}
-
-LinePart::~LinePart()
-{
- if (mImage)
- mImage->decRef();
- mImage = nullptr;
-}
diff --git a/src/gui/widgets/browserbox.h b/src/gui/widgets/browserbox.h
index 55f0163cd..144eddae3 100644
--- a/src/gui/widgets/browserbox.h
+++ b/src/gui/widgets/browserbox.h
@@ -26,6 +26,7 @@
#include "listeners/mouselistener.h"
+#include "gui/widgets/linepart.h"
#include "gui/widgets/widget.h"
#include <list>
@@ -56,47 +57,6 @@ struct BrowserLink final
std::string caption;
};
-class LinePart final
-{
- public:
- LinePart(const int x, const int y, const Color &color,
- const Color &color2, const std::string &text,
- const bool bold) :
- mX(x),
- mY(y),
- mColor(color),
- mColor2(color2),
- mText(text),
- mType(0),
- mImage(nullptr),
- mBold(bold)
- {
- }
-
- LinePart(const int x, const int y, const Color &color,
- const Color &color2, Image *const image) :
- mX(x),
- mY(y),
- mColor(color),
- mColor2(color2),
- mText(),
- mType(1),
- mImage(image),
- mBold(false)
- {
- }
-
- ~LinePart();
-
- int mX, mY;
- Color mColor;
- Color mColor2;
- std::string mText;
- unsigned char mType;
- Image *mImage;
- bool mBold;
-};
-
/**
* A simple browser box able to handle links and forward events to the
* parent conteiner.
diff --git a/src/gui/widgets/linepart.cpp b/src/gui/widgets/linepart.cpp
new file mode 100644
index 000000000..40ea39e55
--- /dev/null
+++ b/src/gui/widgets/linepart.cpp
@@ -0,0 +1,33 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2009 Aethyra Development Team
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "gui/widgets/linepart.h"
+
+#include "resources/image.h"
+
+#include "debug.h"
+
+LinePart::~LinePart()
+{
+ if (mImage)
+ mImage->decRef();
+ mImage = nullptr;
+}
diff --git a/src/gui/widgets/linepart.h b/src/gui/widgets/linepart.h
new file mode 100644
index 000000000..34bc76e8e
--- /dev/null
+++ b/src/gui/widgets/linepart.h
@@ -0,0 +1,75 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2009 Aethyra Development Team
+ * Copyright (C) 2011-2014 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GUI_WIDGETS_LINEPART_H
+#define GUI_WIDGETS_LINEPART_H
+
+#include "gui/color.h"
+
+#include <string>
+
+#include "localconsts.h"
+
+class Image;
+class LinkHandler;
+
+class LinePart final
+{
+ public:
+ LinePart(const int x, const int y, const Color &color,
+ const Color &color2, const std::string &text,
+ const bool bold) :
+ mX(x),
+ mY(y),
+ mColor(color),
+ mColor2(color2),
+ mText(text),
+ mType(0),
+ mImage(nullptr),
+ mBold(bold)
+ {
+ }
+
+ LinePart(const int x, const int y, const Color &color,
+ const Color &color2, Image *const image) :
+ mX(x),
+ mY(y),
+ mColor(color),
+ mColor2(color2),
+ mText(),
+ mType(1),
+ mImage(image),
+ mBold(false)
+ {
+ }
+
+ ~LinePart();
+
+ int mX, mY;
+ Color mColor;
+ Color mColor2;
+ std::string mText;
+ unsigned char mType;
+ Image *mImage;
+ bool mBold;
+};
+
+#endif // GUI_WIDGETS_LINEPART_H