code cleanup
This commit is contained in:
parent
22f0627c56
commit
7148c60c16
|
@ -1879,8 +1879,6 @@ void Editor::setupTextFieldMetrics()
|
||||||
{
|
{
|
||||||
using Q = QskTextField;
|
using Q = QskTextField;
|
||||||
|
|
||||||
// =============
|
|
||||||
|
|
||||||
setStrutSize( Q::TextPanel, { -1, 30_px } );
|
setStrutSize( Q::TextPanel, { -1, 30_px } );
|
||||||
setPadding( Q::TextPanel, { 11_px, 0, 11_px, 0 } );
|
setPadding( Q::TextPanel, { 11_px, 0, 11_px, 0 } );
|
||||||
|
|
||||||
|
@ -1941,6 +1939,7 @@ void Editor::setupTextFieldColors(
|
||||||
setBoxBorderGradient( panel, borderColor1, borderColor2, panelColor );
|
setBoxBorderGradient( panel, borderColor1, borderColor2, panelColor );
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Editor::setupSwitchButtonMetrics()
|
void Editor::setupSwitchButtonMetrics()
|
||||||
{
|
{
|
||||||
using Q = QskSwitchButton;
|
using Q = QskSwitchButton;
|
||||||
|
|
|
@ -401,13 +401,13 @@ void Editor::setupTextInput()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Editor::setupTextArea()
|
void Editor::setupTextField()
|
||||||
{
|
{
|
||||||
using Q = QskTextArea;
|
using Q = QskTextField;
|
||||||
|
|
||||||
setAlignment( Q::Placeholder, Qt::AlignLeft | Qt::AlignTop );
|
setAlignment( Q::Placeholder, Qt::AlignLeft | Qt::AlignVCenter );
|
||||||
|
|
||||||
// ========
|
// ===
|
||||||
|
|
||||||
using A = QskAspect;
|
using A = QskAspect;
|
||||||
using P = QPalette;
|
using P = QPalette;
|
||||||
|
@ -435,13 +435,13 @@ void Editor::setupTextArea()
|
||||||
setPadding( Q::TextPanel, 4_px );
|
setPadding( Q::TextPanel, 4_px );
|
||||||
}
|
}
|
||||||
|
|
||||||
void Editor::setupTextField()
|
void Editor::setupTextArea()
|
||||||
{
|
{
|
||||||
using Q = QskTextField;
|
using Q = QskTextArea;
|
||||||
|
|
||||||
setAlignment( Q::Placeholder, Qt::AlignLeft | Qt::AlignVCenter );
|
setAlignment( Q::Placeholder, Qt::AlignLeft | Qt::AlignTop );
|
||||||
|
|
||||||
// ===
|
// ========
|
||||||
|
|
||||||
using A = QskAspect;
|
using A = QskAspect;
|
||||||
using P = QPalette;
|
using P = QPalette;
|
||||||
|
|
|
@ -487,8 +487,6 @@ void Editor::setupTextField()
|
||||||
{
|
{
|
||||||
using Q = QskTextField;
|
using Q = QskTextField;
|
||||||
|
|
||||||
// ===
|
|
||||||
|
|
||||||
setStrutSize( Q::Panel, -1.0, 56_px );
|
setStrutSize( Q::Panel, -1.0, 56_px );
|
||||||
setPadding( Q::Panel, { 12_px, 8_px, 12_px, 8_px } );
|
setPadding( Q::Panel, { 12_px, 8_px, 12_px, 8_px } );
|
||||||
setGradient( Q::Panel, m_pal.surfaceVariant );
|
setGradient( Q::Panel, m_pal.surfaceVariant );
|
||||||
|
|
|
@ -11,7 +11,7 @@ using Q = QskTextField;
|
||||||
QskTextFieldSkinlet::QskTextFieldSkinlet( QskSkin* skin )
|
QskTextFieldSkinlet::QskTextFieldSkinlet( QskSkin* skin )
|
||||||
: Inherited( skin )
|
: Inherited( skin )
|
||||||
{
|
{
|
||||||
setNodeRoles( { PanelRole, TextPanelRole, PlaceholderTextRole } );
|
setNodeRoles( { PanelRole, TextPanelRole, PlaceholderRole } );
|
||||||
}
|
}
|
||||||
|
|
||||||
QskTextFieldSkinlet::~QskTextFieldSkinlet()
|
QskTextFieldSkinlet::~QskTextFieldSkinlet()
|
||||||
|
@ -51,7 +51,7 @@ QSGNode* QskTextFieldSkinlet::updateSubNode(
|
||||||
return updateBoxNode( skinnable, node, Q::Panel );
|
return updateBoxNode( skinnable, node, Q::Panel );
|
||||||
}
|
}
|
||||||
|
|
||||||
case PlaceholderTextRole:
|
case PlaceholderRole:
|
||||||
{
|
{
|
||||||
const auto text = effectivePlaceholderText( textField );
|
const auto text = effectivePlaceholderText( textField );
|
||||||
if ( text.isEmpty() )
|
if ( text.isEmpty() )
|
||||||
|
|
|
@ -21,7 +21,7 @@ class QSK_EXPORT QskTextFieldSkinlet : public QskAbstractTextInputSkinlet
|
||||||
{
|
{
|
||||||
PanelRole = QskAbstractTextInputSkinlet::RoleCount,
|
PanelRole = QskAbstractTextInputSkinlet::RoleCount,
|
||||||
|
|
||||||
PlaceholderTextRole,
|
PlaceholderRole,
|
||||||
RoleCount
|
RoleCount
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue