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

switch mate-about to GtkAboutDialog and drop MateAboutDialog #282

Merged
merged 3 commits into from Sep 12, 2017

Conversation

Projects
None yet
3 participants
@monsta
Copy link
Member

monsta commented Aug 14, 2017

Please test and tell what you think about the height of the credits window. In my opinion, it's too small for the huge amount of credits we have in mate-about app. But if it's ok with you guys, I think we can merge it.

@raveit65

This comment has been minimized.

Copy link
Member

raveit65 commented Aug 16, 2017

You are kidding :-)

[rave@mother mate-desktop]$ LANG=C
[rave@mother mate-desktop]$ git rebase master
First, rewinding head to replay your work on top of it...
Applying: mate-about: switch to GtkAboutDialog
Applying: mate-about: remove remains of libunique references
Applying: drop MateAboutDialog
Using index info to reconstruct a base tree...
M	libmate-desktop/mate-aboutdialog.c
Falling back to patching base and 3-way merge...
Removing libmate-desktop/mate-aboutdialog.h
CONFLICT (modify/delete): libmate-desktop/mate-aboutdialog.c deleted in drop MateAboutDialog and modified in HEAD. Version HEAD of libmate-desktop/mate-aboutdialog.c left in tree.
error: Failed to merge in the changes.
Patch failed at 0003 drop MateAboutDialog
The copy of the patch that failed is found in: .git/rebase-apply/patch

When you have resolved this problem, run "git rebase --continue".
If you prefer to skip this patch, run "git rebase --skip" instead.
To check out the original branch and stop rebasing, run "git rebase --abort".
@lukefromdc
Copy link
Member

lukefromdc left a comment

This works, and the scrolledwindow height is not unreasonable. I've seen plenty of cases where a scrolledwindow only wants to go 1 or 2 lines of text high, we didn't get that problem on this PR.

Found a bug in my own theme with this too, applying only to the GtkAbout dialog. Thought we had a problem, but my theme gave white on white text. Menta and Traditional-Green(tested) worked fine

@raveit65

This comment has been minimized.

Copy link
Member

raveit65 commented Aug 16, 2017

For me this scrolledwindow with the credit credit list is OK.
mate-about

But it's possible to set a height-request for the whole GtkAboutDialog, ie 600. ;-)
mate-about-with-height-rquest
And you can set the window resizable if you want.

At least this list needs to sorted to reflect more reality.

@raveit65
Copy link
Member

raveit65 left a comment

It's Ok, but feel free to set another window height and other improvements.

@monsta monsta force-pushed the cleanup branch from 51b0da8 to f03d086 Aug 17, 2017

@monsta

This comment has been minimized.

Copy link
Member

monsta commented Aug 17, 2017

Hmm I thought I already rebased it and solved that conflict in the process... Ok, here goes another rebase. 🙂

@monsta

This comment has been minimized.

Copy link
Member

monsta commented Aug 17, 2017

I didn't know GtkAboutDialog can be made resizable BTW. I think all our apps use non-resizable one...

@raveit65

This comment has been minimized.

Copy link
Member

raveit65 commented Aug 17, 2017

@raveit65

This comment has been minimized.

Copy link
Member

raveit65 commented Aug 17, 2017

At least i can change those values with gtk3-inspector, so it should be work in code too.

@monsta monsta force-pushed the cleanup branch from f03d086 to 664f21a Aug 26, 2017

@raveit65

This comment has been minimized.

Copy link
Member

raveit65 commented Sep 10, 2017

I am using this for f27 beta, don't know for what you waiting for.....

@monsta

This comment has been minimized.

Copy link
Member

monsta commented Sep 12, 2017

Ok, I'll merge it as is for now, it's been a long time indeed.

@monsta monsta merged commit 664f21a into master Sep 12, 2017

@monsta monsta deleted the cleanup branch Sep 12, 2017

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment