summaryrefslogtreecommitdiff
path: root/src/gui/widgets
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui/widgets')
-rw-r--r--src/gui/widgets/itemlinkhandler.cpp4
-rw-r--r--src/gui/widgets/listbox.cpp2
-rw-r--r--src/gui/widgets/passwordfield.h2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/gui/widgets/itemlinkhandler.cpp b/src/gui/widgets/itemlinkhandler.cpp
index e5c6c06b3..50e99a24c 100644
--- a/src/gui/widgets/itemlinkhandler.cpp
+++ b/src/gui/widgets/itemlinkhandler.cpp
@@ -111,9 +111,9 @@ void ItemLinkHandler::handleLink(const std::string &link, MouseEvent *event)
splitToIntVector(str, link, ',');
if (str.empty())
return;
- int color = 1;
+ unsigned char color = 1;
if (str.size() > 1)
- color = str[1];
+ color = static_cast<unsigned char>(str[1]);
const int id = str[0];
if (id > 0)
{
diff --git a/src/gui/widgets/listbox.cpp b/src/gui/widgets/listbox.cpp
index 68b50c458..5a8cc26e8 100644
--- a/src/gui/widgets/listbox.cpp
+++ b/src/gui/widgets/listbox.cpp
@@ -366,7 +366,7 @@ int ListBox::getSelectionByMouse(const int y) const
{
if (y < mPadding)
return -1;
- return (y - mPadding) / getRowHeight();
+ return static_cast<unsigned int>(y - mPadding) / getRowHeight();
}
void ListBox::setSelected(const int selected)
diff --git a/src/gui/widgets/passwordfield.h b/src/gui/widgets/passwordfield.h
index f72350763..4c05afd40 100644
--- a/src/gui/widgets/passwordfield.h
+++ b/src/gui/widgets/passwordfield.h
@@ -47,7 +47,7 @@ class PasswordField final : public TextField
void draw(Graphics *graphics) override final;
protected:
- int mPasswordChar;
+ char mPasswordChar;
};
#endif // GUI_WIDGETS_PASSWORDFIELD_H