make no state default
This commit is contained in:
parent
ad24230b9b
commit
cb2a903555
|
@ -1589,14 +1589,7 @@ void Editor::setupTextInputColors(
|
||||||
{
|
{
|
||||||
QRgb panelColor = Qt::black, borderColor1 = Qt::black, borderColor2 = Qt::black, textColor = Qt::black;
|
QRgb panelColor = Qt::black, borderColor1 = Qt::black, borderColor2 = Qt::black, textColor = Qt::black;
|
||||||
|
|
||||||
if ( state == A::NoState )
|
if ( state == Q::Disabled )
|
||||||
{
|
|
||||||
panelColor = pal.fillColor.control.defaultColor;
|
|
||||||
borderColor1 = pal.elevation.textControl.border[0];
|
|
||||||
borderColor2 = pal.elevation.textControl.border[1];
|
|
||||||
textColor = pal.fillColor.text.secondary;
|
|
||||||
}
|
|
||||||
else if ( state == Q::Disabled )
|
|
||||||
{
|
{
|
||||||
panelColor = pal.fillColor.control.secondary;
|
panelColor = pal.fillColor.control.secondary;
|
||||||
borderColor1 = pal.elevation.textControl.border[0];
|
borderColor1 = pal.elevation.textControl.border[0];
|
||||||
|
@ -1616,6 +1609,13 @@ void Editor::setupTextInputColors(
|
||||||
borderColor1 = borderColor2 = pal.strokeColor.control.defaultColor;
|
borderColor1 = borderColor2 = pal.strokeColor.control.defaultColor;
|
||||||
textColor = pal.fillColor.text.disabled;
|
textColor = pal.fillColor.text.disabled;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
panelColor = pal.fillColor.control.defaultColor;
|
||||||
|
borderColor1 = pal.elevation.textControl.border[0];
|
||||||
|
borderColor2 = pal.elevation.textControl.border[1];
|
||||||
|
textColor = pal.fillColor.text.secondary;
|
||||||
|
}
|
||||||
|
|
||||||
const auto panel = Q::Panel | section | state;
|
const auto panel = Q::Panel | section | state;
|
||||||
const auto text = Q::Text | section | state;
|
const auto text = Q::Text | section | state;
|
||||||
|
|
Loading…
Reference in New Issue