Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove spacers in non-LargeSideBar modes for FancyTabWidget #6165

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

amhndu
Copy link
Contributor

@amhndu amhndu commented Oct 7, 2018

To maintain behavior with the older FancyTabWidget, spacers are now
removed and stored when switching to a non-LargeSideBar mode.
And subsequently restored when switching back to LargeSideBar mode.

Fixes #6163

@amhndu amhndu force-pushed the spacers-fancytabwidget branch from 919624d to 789251f Compare October 7, 2018 10:15
@jonaski
Copy link
Contributor

jonaski commented Oct 7, 2018

Is there any reason why this is done on qt5 and not master?
You should make the pull requests on master unless it's a specific fix only to Qt 5, otherwise it makes it harder to merge.

@amhndu
Copy link
Contributor Author

amhndu commented Oct 7, 2018

Thanks, I wasn't really aware. I thought qt5 is the main development branch

@amhndu
Copy link
Contributor Author

amhndu commented Oct 7, 2018

@jonaski A different PR of mine was merged to qt5 similarly, should I make a new PR cherry-picking that onto master ? (and similarly for this)

@jonaski
Copy link
Contributor

jonaski commented Oct 7, 2018

I'm not the project owner or maintainer here. But I suggest that yes.
Whats done until now is that we create PRs mainly on master and then we merge master into qt 5.
As long as they want to still keep Qt 4 support and have that in master.

To maintain behavior with the older FancyTabWidget, spacers are now
removed and stored when switching to a non-LargeSideBar mode.
And subsequently restored when switching back to LargeSideBar mode.
@amhndu amhndu changed the base branch from qt5 to master October 7, 2018 10:48
@amhndu amhndu force-pushed the spacers-fancytabwidget branch from 789251f to f13e8d7 Compare October 7, 2018 10:50
@ghost
Copy link

ghost commented Nov 8, 2018

I wonder if there's a reason to keep master on Qt 4.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants