razzaline/tahoma2d
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity

Fix for theme viewer colors and stop motion light

Browse source
This commit is contained in:
Jeremy Bullock 2020-06-19 16:28:50 -06:00
parent 39a6f091ef
commit bb35b2bdf1
4 changed files with 2294 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2199
stuff/config/qss/Darker/Darker.qss Normal file
View file

File diff suppressed because it is too large Load diff

92
stuff/config/qss/Medium/less/themes/Darker.less Normal file
View file

@ -0,0 +1,92 @@
// out: ../../../Darker/Darker.qss
// -----------------------------------------------------------------------------
// DARK
// -----------------------------------------------------------------------------
// Override
@import '../Medium';
// Resource Location
@img-url: '../Medium/imgs/white';
@bg: #202020;
@accent: darken(@bg, 10);
// -----------------------------------------------------------------------------
// Menu
// -----------------------------------------------------------------------------
@menu-bg-color: darken(@bg, 4);
@menu-border-color: lighten(@menu-bg-color, 15);
@menu-separator-color: @menu-border-color;
// -----------------------------------------------------------------------------
// Trees
// -----------------------------------------------------------------------------
@tree-bg-color: darken(@bg, 6);
// -----------------------------------------------------------------------------
// Textfield
// -----------------------------------------------------------------------------
@input-bg-color: darken(@bg, 8);
@input-border-color: lighten(@bg, 10);
// -----------------------------------------------------------------------------
// CheckBox
// -----------------------------------------------------------------------------
@checkbox-border-color: @input-border-color;
@checkbox-border-color-disabled: @input-border-color-disabled;
@checkbox-border-color-hover: lighten(@bg, 70);
@checkbox-border-color-checked: @checkbox-bg-color-checked;
// For RadioButton
@radiobutton-img-unchecked: 'radiobutton-dark_unchecked.svg';
@radiobutton-img-unchecked-hover: 'radiobutton-dark_unchecked_hover.svg';
@radiobutton-img-unchecked-disabled: 'radiobutton-dark_unchecked_disabled.svg';
// -----------------------------------------------------------------------------
// Slider
// -----------------------------------------------------------------------------
// SVG
@slider-groove-img: 'slider-groove_dark.svg';
@slider-groove-img-disabled: 'slider-groove_disabled_dark.svg';
// DoublePairField, IntPairField
@slider-groove-color: darken(@bg, 9);
// -----------------------------------------------------------------------------
// Viewer Window
// -----------------------------------------------------------------------------
// Flip Slider
@flipmarker-img: 'flipmarker_dark.svg';
@flipslider-img: 'flipslider_dark.svg';
// -----------------------------------------------------------------------------
// Progress Bar
// -----------------------------------------------------------------------------
@progressbar-bg-color: darken(@bg, 4);
// -----------------------------------------------------------------------------
// XSheet
// -----------------------------------------------------------------------------
@xsheet-bg-color: darken(@bg, 2);
@xsheet-OnionSkinAreaBG-color: darken(@bg, 2);
@xsheet-EmptyColumnHead-color: lighten(@bg, 8);
@xsheet-EmptyCell-color: @bg;
@xsheet-NotEmptyColumn-color: lighten(@bg, 3);
@xsheet-LightLightBG-color: @xsheet-EmptyCell-color;
// -----------------------------------------------------------------------------
// Function Editor
// -----------------------------------------------------------------------------
// Function Curve Panel
@function-panel-OtherCurves-color: lighten(@function-panel-bg-color, 30);

3
toonz/sources/stopmotion/stopmotionlight.cpp
View file

@ -219,6 +219,7 @@ void StopMotionLight::showOverlays() {
// taking a photo
qApp->processEvents(QEventLoop::AllEvents, 1500);
}
m_pixmapFrame = -1;
m_overlaysReady = true;
}
@ -263,7 +264,7 @@ bool StopMotionLight::useOverlays() {
QPixmap StopMotionLight::getSceneImage(TDimension size) {
TXsheet* xsh = TApp::instance()->getCurrentXsheet()->getXsheet();
int frame = StopMotion::instance()->getXSheetFrameNumber() - 1;
int frame = TApp::instance()->getCurrentFrame()->getFrame();
if (frame == -1) frame = 0;
bool isEmpty = true;

3
toonz/sources/toonz/preferencespopup.cpp
View file

@ -556,6 +556,7 @@ void PreferencesPopup::onUseThemeViewerColorsChanged() {
bool enable = m_pref->getBoolValue(useThemeViewerColors);
m_controlIdMap.key(viewerBGColor)->setEnabled(!enable);
m_controlIdMap.key(previewBGColor)->setEnabled(!enable);
notifySceneChanged();
}
//-----------------------------------------------------------------------------
@ -1810,8 +1811,6 @@ QWidget* PreferencesPopup::createColorsPage() {
&PreferencesPopup::notifySceneChanged);
m_onEditedFuncMap.insert(useThemeViewerColors,
&PreferencesPopup::onUseThemeViewerColorsChanged);
m_onEditedFuncMap.insert(useThemeViewerColors,
&PreferencesPopup::notifySceneChanged);
bool enable = m_pref->getBoolValue(useThemeViewerColors);
if (enable) {