@@ -2492,7 +2492,7 @@ QRect Style::tabWidgetTabBarRect(const QStyleOption *option, const QWidget *widg
24922492 if (tabBarAlignment == Qt::AlignCenter) {
24932493 tabBarRect.moveLeft (rect.left () + (rect.width () - tabBarRect.width ()) / 2 );
24942494 } else if (tabOption->lineWidth == 0 ) {
2495- tabBarRect.moveLeft (rect.left () + 4 );
2495+ tabBarRect.moveLeft (rect.left ());
24962496 } else {
24972497 tabBarRect.moveLeft (rect.left () - 1 );
24982498 }
@@ -3857,31 +3857,34 @@ bool Style::drawFrameLineEditPrimitive(const QStyleOption *option, QPainter *pai
38573857 auto outline (palette.color (QPalette::Highlight));
38583858
38593859 bool isVisible = false ;
3860+ const auto isControl = isQtQuickControl (option, widget);
38603861
3861- // take precautions only change this on the Dolphin location bar
3862- if (_isDolphin && widget->inherits (" DolphinUrlNavigator" )) {
3863- // check if the Dolphin URL location bar is visible
3862+ if (_isDolphin && !isControl) {
3863+ // take precautions only change this on the Dolphin location bar
3864+ if (widget->inherits (" DolphinUrlNavigator" )) {
3865+ // check if the Dolphin URL location bar is visible
38643866
3865- // only change the alpha channel if the Dolphin URL location bar is hidden
3866- // otherwise the rectangle doesn't render rounded eges
3867+ // only change the alpha channel if the Dolphin URL location bar is hidden
3868+ // otherwise the rectangle doesn't render rounded eges
38673869
3868- if (widget->findChild <QComboBox *>()) {
3869- isVisible = widget->findChild <QComboBox *>()->isVisible ();
3870+ if (widget->findChild <QComboBox *>()) {
3871+ isVisible = widget->findChild <QComboBox *>()->isVisible ();
38703872
3871- if (!isVisible) {
3872- // breadcrumb view not editable location
3873- if (StyleConfigData::toolBarOpacity () < 100 ) {
3874- background.setAlphaF (StyleConfigData::toolBarOpacity () / 100 );
3875- } else if (StyleConfigData::disableDolphinUrlNavigatorBackground ()) {
3876- background.setAlphaF (0 );
3877- }
3878- // URL location path
3879- QLineEdit *dolphinLineEdit = widget->findChild <QLineEdit *>();
3880- // change the background to make it opaque aswell
3881- if (dolphinLineEdit) {
3882- QPalette pal (dolphinLineEdit->palette ());
3883- pal.setColor (QPalette::Window, background);
3884- dolphinLineEdit->setPalette (pal);
3873+ if (!isVisible) {
3874+ // breadcrumb view not editable location
3875+ if (StyleConfigData::toolBarOpacity () < 100 ) {
3876+ background.setAlphaF (StyleConfigData::toolBarOpacity () / 100 );
3877+ } else if (StyleConfigData::disableDolphinUrlNavigatorBackground ()) {
3878+ background.setAlphaF (0 );
3879+ }
3880+ // URL location path
3881+ QLineEdit *dolphinLineEdit = widget->findChild <QLineEdit *>();
3882+ // change the background to make it opaque aswell
3883+ if (dolphinLineEdit) {
3884+ QPalette pal (dolphinLineEdit->palette ());
3885+ pal.setColor (QPalette::Window, background);
3886+ dolphinLineEdit->setPalette (pal);
3887+ }
38853888 }
38863889 }
38873890 }
0 commit comments