Merge pull request #865 from manongjohn/level_editor_vector_bg_color
Change Level Editor background for Vector levels
This commit is contained in:
commit
3bcec4f4b5
2 changed files with 9 additions and 2 deletions
|
@ -1152,7 +1152,7 @@ QString PreferencesPopup::getUIString(PreferencesItemId id) {
|
||||||
{previewBGColor, tr("Preview BG Color:")},
|
{previewBGColor, tr("Preview BG Color:")},
|
||||||
{useThemeViewerColors,
|
{useThemeViewerColors,
|
||||||
tr("Use the Curent Theme's Viewer Background Colors")},
|
tr("Use the Curent Theme's Viewer Background Colors")},
|
||||||
{levelEditorBoxColor, tr("Level Editor Box Color:")},
|
{levelEditorBoxColor, tr("Level Editor Canvas Color:")},
|
||||||
{chessboardColor1, tr("Chessboard Color 1:")},
|
{chessboardColor1, tr("Chessboard Color 1:")},
|
||||||
{chessboardColor2, tr("Chessboard Color 2:")},
|
{chessboardColor2, tr("Chessboard Color 2:")},
|
||||||
{transpCheckInkOnWhite, tr("Ink Color on White BG:")},
|
{transpCheckInkOnWhite, tr("Ink Color on White BG:")},
|
||||||
|
|
|
@ -1373,10 +1373,17 @@ void SceneViewer::drawBackground() {
|
||||||
} else
|
} else
|
||||||
bgColor = Preferences::instance()->getPreviewBgColor();
|
bgColor = Preferences::instance()->getPreviewBgColor();
|
||||||
} else {
|
} else {
|
||||||
if (Preferences::instance()->getUseThemeViewerColors()) {
|
TXshLevelHandle *levelHandle = TApp::instance()->getCurrentLevel();
|
||||||
|
TXshSimpleLevel *sl = levelHandle ? levelHandle->getSimpleLevel() : 0;
|
||||||
|
bool isVectorLevel = sl ? sl->getType() == PLI_XSHLEVEL : false;
|
||||||
|
bool isEditingLevel = TApp::instance()->getCurrentFrame()->isEditingLevel();
|
||||||
|
|
||||||
|
if (Preferences::instance()->getUseThemeViewerColors() && (!isEditingLevel || !isVectorLevel)) {
|
||||||
QColor qtBgColor = getBGColor();
|
QColor qtBgColor = getBGColor();
|
||||||
bgColor =
|
bgColor =
|
||||||
TPixel32(qtBgColor.red(), qtBgColor.green(), qtBgColor.blue());
|
TPixel32(qtBgColor.red(), qtBgColor.green(), qtBgColor.blue());
|
||||||
|
} else if (isVectorLevel && isEditingLevel) {
|
||||||
|
bgColor = Preferences::instance()->getLevelEditorBoxColor();
|
||||||
} else
|
} else
|
||||||
bgColor = Preferences::instance()->getViewerBgColor();
|
bgColor = Preferences::instance()->getViewerBgColor();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue