From 3ff44da4af7307a725758fd13763d5926d1051fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Lucas=20Golini?= Date: Sun, 26 Apr 2020 01:04:39 -0300 Subject: [PATCH] Minor changes. --- bin/assets/ui/breeze.css | 17 ++++++------- include/eepp/ui/uiscenenode.hpp | 4 +++ src/eepp/ui/uiscenenode.cpp | 44 +++++++++++++++++++-------------- src/eepp/ui/uiwidget.cpp | 7 +++--- 4 files changed, 41 insertions(+), 31 deletions(-) diff --git a/bin/assets/ui/breeze.css b/bin/assets/ui/breeze.css index 6b4fabcdb..e492f8a03 100644 --- a/bin/assets/ui/breeze.css +++ b/bin/assets/ui/breeze.css @@ -490,7 +490,7 @@ ComboBox::Button:hover { } SpinBox::btndown { - width: 12dp; + width: 16dp; height: 12dp; foreground-image: poly(line, var(--icon), "1dp 4dp, 5dp 7dp"), poly(line, var(--icon), "5dp 7dp, 9dp 4dp"); } @@ -500,7 +500,7 @@ SpinBox::btndown:hover { } SpinBox::btnup { - width: 12dp; + width: 16dp; height: 12dp; foreground-image: poly(line, var(--icon), "1dp 7dp, 5dp 4dp"), poly(line, var(--icon), "5dp 4dp, 9dp 7dp"); } @@ -513,10 +513,6 @@ WinMenu { height: 24dp; } -WinMenu { - padding-left: 4dp; -} - Menu, PopUpMenu { background-color: var(--menu-back); @@ -549,14 +545,12 @@ Menu::SubMenu { Menu::Item:hover, Menu::CheckBox:hover, -Menu::Separator:hover, Menu::SubMenu:hover { background-color: var(--primary); } Menu::Item::text, Menu::CheckBox::text, -Menu::Separator::text, Menu::SubMenu::text { padding-right: 4dp; color: var(--menu-font); @@ -579,8 +573,11 @@ Tab:pressed { } Menu::Separator { - height: 1dp; - background-color: var(--button-border); + height: 3dp; + background-color: var(--button-back); + background-image: rectangle(solid, var(--button-border)); + background-size: 100% 1dp; + background-position: center; } :root { diff --git a/include/eepp/ui/uiscenenode.hpp b/include/eepp/ui/uiscenenode.hpp index cc6e5b772..1d6645461 100644 --- a/include/eepp/ui/uiscenenode.hpp +++ b/include/eepp/ui/uiscenenode.hpp @@ -88,6 +88,10 @@ class EE_API UISceneNode : public SceneNode { void setIsLoading( bool isLoading ); + void updateDirtyStyles(); + + void updateDirtyStyleStates(); + protected: friend class EE::UI::UIWindow; friend class EE::UI::UIWidget; diff --git a/src/eepp/ui/uiscenenode.cpp b/src/eepp/ui/uiscenenode.cpp index 0a6957388..a6493f73c 100644 --- a/src/eepp/ui/uiscenenode.cpp +++ b/src/eepp/ui/uiscenenode.cpp @@ -379,25 +379,9 @@ void UISceneNode::update( const Time& elapsed ) { SceneNode::update( elapsed ); - if ( !mDirtyStyle.empty() ) { - Clock clock; - for ( auto& node : mDirtyStyle ) { - node->reloadStyle( true, false, false ); - } - mDirtyStyle.clear(); - eePRINTL( "CSS Styles Reloaded in %.2f ms", clock.getElapsedTime().asMilliseconds() ); - } + updateDirtyStyles(); - if ( !mDirtyStyleState.empty() ) { - Clock clock; - for ( auto& node : mDirtyStyleState ) { - node->reportStyleStateChangeRecursive( mDirtyStyleStateCSSAnimations[node] ); - } - mDirtyStyleState.clear(); - mDirtyStyleStateCSSAnimations.clear(); - eePRINTL( "CSS Style State Invalidated, reapplied state in %.2f ms", - clock.getElapsedTime().asMilliseconds() ); - } + updateDirtyStyleStates(); SceneManager::instance()->setCurrentUISceneNode( uiSceneNode ); } @@ -513,6 +497,30 @@ void UISceneNode::setIsLoading( bool isLoading ) { mIsLoading = isLoading; } +void UISceneNode::updateDirtyStyles() { + if ( !mDirtyStyle.empty() ) { + Clock clock; + for ( auto& node : mDirtyStyle ) { + node->reloadStyle( true, false, false ); + } + mDirtyStyle.clear(); + eePRINTL( "CSS Styles Reloaded in %.2f ms", clock.getElapsedTime().asMilliseconds() ); + } +} + +void UISceneNode::updateDirtyStyleStates() { + if ( !mDirtyStyleState.empty() ) { + Clock clock; + for ( auto& node : mDirtyStyleState ) { + node->reportStyleStateChangeRecursive( mDirtyStyleStateCSSAnimations[node] ); + } + mDirtyStyleState.clear(); + mDirtyStyleStateCSSAnimations.clear(); + eePRINTL( "CSS Style State Invalidated, reapplied state in %.2f ms", + clock.getElapsedTime().asMilliseconds() ); + } +} + bool UISceneNode::onMediaChanged() { if ( !mStyleSheet.isMediaQueryListEmpty() ) { MediaFeatures media; diff --git a/src/eepp/ui/uiwidget.cpp b/src/eepp/ui/uiwidget.cpp index df1493197..feb6287f2 100644 --- a/src/eepp/ui/uiwidget.cpp +++ b/src/eepp/ui/uiwidget.cpp @@ -44,13 +44,13 @@ UIWidget::UIWidget( const std::string& tag ) : mAttributesTransactionCount( 0 ) { mNodeFlags |= NODE_FLAG_WIDGET; + createStyle(); + if ( NULL != mUISceneNode && !isSceneNodeLoading() && !isLoadingState() ) { mUISceneNode->invalidateStyle( this ); mUISceneNode->invalidateStyleState( this, true ); } - createStyle(); - updateAnchorsDistances(); } @@ -963,8 +963,9 @@ void UIWidget::onMarginChange() { void UIWidget::onThemeLoaded() {} void UIWidget::onParentChange() { - if ( !isSceneNodeLoading() && !isLoadingState() ) + if ( !isSceneNodeLoading() && !isLoadingState() ) { getUISceneNode()->invalidateStyle( this ); + } } void UIWidget::onClassChange() {