diff options
| -rw-r--r-- | src/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gui/mouseoverlink.h | 49 | ||||
| -rw-r--r-- | src/gui/widgets/browserbox.cpp | 25 |
4 files changed, 52 insertions, 24 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e82b73366..0f1952173 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -373,6 +373,7 @@ SET(SRCS gui/gui.cpp gui/gui.h gui/mailmessage.h + gui/mouseoverlink.h gui/windows/helpwindow.cpp gui/windows/helpwindow.h gui/windows/insertcarddialog.cpp diff --git a/src/Makefile.am b/src/Makefile.am index c16c71395..0bbe07a2e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -367,6 +367,7 @@ BASE_SRC += events/actionevent.h \ gui/gui.cpp \ gui/gui.h \ gui/mailmessage.h \ + gui/mouseoverlink.h \ gui/windows/okdialog.cpp \ gui/windows/okdialog.h \ gui/onlineplayer.h \ diff --git a/src/gui/mouseoverlink.h b/src/gui/mouseoverlink.h new file mode 100644 index 000000000..27babe3eb --- /dev/null +++ b/src/gui/mouseoverlink.h @@ -0,0 +1,49 @@ +/* + * The ManaPlus Client + * Copyright (C) 2004-2009 The Mana World Development Team + * Copyright (C) 2009-2010 The Mana Developers + * Copyright (C) 2011-2017 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_MOUSEOVERLINK_H +#define GUI_MOUSEOVERLINK_H + +#include "localconsts.h" + +struct MouseOverLink final +{ + MouseOverLink(const int x, + const int y) : + mX(x), + mY(y) + { } + + A_DEFAULT_COPY(MouseOverLink) + + bool operator() (const BrowserLink &link) const + { + return (mX >= link.x1 && + mX < link.x2 && + mY >= link.y1 && + mY < link.y2); + } + const int mX; + const int mY; +}; + +#endif // GUI_MOUSEOVERLINK_H diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 79de4f8ef..38c76bac6 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -26,6 +26,7 @@ #include "enums/gui/linkhighlightmode.h" #include "gui/gui.h" +#include "gui/mouseoverlink.h" #include "gui/skin.h" #include "gui/fonts/font.h" @@ -50,30 +51,6 @@ #include "debug.h" -namespace -{ - struct MouseOverLink final - { - MouseOverLink(const int x, - const int y) : - mX(x), - mY(y) - { } - - A_DEFAULT_COPY(MouseOverLink) - - bool operator() (const BrowserLink &link) const - { - return (mX >= link.x1 && - mX < link.x2 && - mY >= link.y1 && - mY < link.y2); - } - const int mX; - const int mY; - }; -} // namespace - ImageSet *BrowserBox::mEmotes = nullptr; int BrowserBox::mInstances = 0; |