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

fix #68151: Allowed Edit Style window to remember last user resize #2486

Closed
wants to merge 0 commits into from

Conversation

WASamK
Copy link
Contributor

@WASamK WASamK commented Mar 24, 2016

No description provided.

@Jojo-Schmitz
Copy link
Contributor

Ah, much better than #2461

</rect>
</property>
<property name="sizePolicy">
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are these changes to the UI file really needed?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without a single change to the original UI, the "remember last user resize" and "remember last user position" still works,
But the window can only be expanded. So all these changes are to allow the window to contract. But sure, will go through each one and see what is absolutely necessary.

@lasconic
Copy link
Contributor

I asked for some changes. You can make then as follow.

$ git checkout WASamK:68151-editstyle

#Do the changes, you can get previous version of a file from github.com if necessary.

# check the changed files
$ git status
# check the diff of your changes 
$ git diff 

$ git add thefile.cpp thefile2.cpp
$ git commit -m "fix lines etc..."
$ git rebase -i HEAD~2
# change second line with squash see http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html

$ git push --force origin WASamK:68151-editstyle

# this PR should now be updated with your changes and with a single commit.

@Jojo-Schmitz
Copy link
Contributor

I'm doing this differently, git commit --amend, just safe the commit message (changed or unchanged), undo last commit in GitHub for Windows, make the changes, commit again, and finally git push -f.

@WASamK
Copy link
Contributor Author

WASamK commented Mar 28, 2016

I accidently deleted all my commits. So I commited again and created another pull request. Hope that's okay.
#2500

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.

3 participants