krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity

Editor: Do color to int conversion in ColorEditor

Browse source
This commit is contained in:
Rob Cutmore 2017-07-26 19:56:54 -04:00
parent c7241c692f
commit 3f2cd9b669
3 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/opencs/view/widget/coloreditor.cpp
View file

@ -64,6 +64,11 @@ QColor CSVWidget::ColorEditor::color() const
return mColor; return mColor;
} }
int CSVWidget::ColorEditor::colorInt() const
{
return (mColor.blue() << 16) | (mColor.green() << 8) | (mColor.red());
}
void CSVWidget::ColorEditor::setColor(const QColor &color) void CSVWidget::ColorEditor::setColor(const QColor &color)
{ {
mColor = color; mColor = color;

4
apps/opencs/view/widget/coloreditor.hpp
View file

@ -26,6 +26,10 @@ namespace CSVWidget
ColorEditor(const int colorInt, QWidget *parent = 0, const bool popupOnStart = false); ColorEditor(const int colorInt, QWidget *parent = 0, const bool popupOnStart = false);
QColor color() const; QColor color() const;
/// \return Color RGB value encoded in an int.
int colorInt() const;
void setColor(const QColor &color); void setColor(const QColor &color);
/// \brief Set color using given int value. /// \brief Set color using given int value.

3
apps/opencs/view/world/util.cpp
View file

@ -133,8 +133,7 @@ void CSVWorld::CommandDelegate::setModelDataImp (QWidget *editor, QAbstractItemM
CSVWidget::ColorEditor *colorEditor = qobject_cast<CSVWidget::ColorEditor *>(editor); CSVWidget::ColorEditor *colorEditor = qobject_cast<CSVWidget::ColorEditor *>(editor);
if (colorEditor != NULL) if (colorEditor != NULL)
{ {
QColor color = colorEditor->color(); variant = colorEditor->colorInt();
variant = (color.blue() << 16) | (color.green() << 8) | (color.red());
} }
else else
{ {