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

added separate display type for colours

Browse source
This commit is contained in:
Marc Zinnschlag 2014-07-08 09:08:01 +02:00
parent b2ce94f28a
commit 9d5956585c
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/opencs/model/world/columnbase.hpp
View file

@ -92,7 +92,8 @@ namespace CSMWorld
Display_EnchantmentType, Display_EnchantmentType,
Display_BodyPartType, Display_BodyPartType,
Display_MeshType, Display_MeshType,
Display_Gender Display_Gender,
Display_Colour
}; };
int mColumnId; int mColumnId;

2
apps/opencs/model/world/columnimp.hpp
View file

@ -634,7 +634,7 @@ namespace CSMWorld
{ {
/// \todo Replace Display_Integer with something that displays the colour value more directly. /// \todo Replace Display_Integer with something that displays the colour value more directly.
MapColourColumn() MapColourColumn()
: Column<ESXRecordT> (Columns::ColumnId_MapColour, ColumnBase::Display_Integer) : Column<ESXRecordT> (Columns::ColumnId_MapColour, ColumnBase::Display_Colour)
{} {}
virtual QVariant get (const Record<ESXRecordT>& record) const virtual QVariant get (const Record<ESXRecordT>& record) const

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

@ -145,10 +145,11 @@ QWidget *CSVWorld::CommandDelegate::createEditor (QWidget *parent, const QStyleO
if (display != CSMWorld::ColumnBase::Display_None) if (display != CSMWorld::ColumnBase::Display_None)
{ {
if (variant.type() == QVariant::Color) if (display == CSMWorld::ColumnBase::Display_Colour)
{ {
return new QLineEdit(parent); return new QLineEdit(parent);
} }
if (display == CSMWorld::ColumnBase::Display_Integer) if (display == CSMWorld::ColumnBase::Display_Integer)
{ {
return new QSpinBox(parent); return new QSpinBox(parent);