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

FileConflictDialog: Gtk4 prep #2228

Merged
merged 1 commit into from
Jul 2, 2023
Merged

Conversation

danirabbit
Copy link
Member

Includes changes from #2225

  • Remove skip_taskbar_hint
  • Boxes instead of Grids
  • Use child property where appropriate

@danirabbit danirabbit requested a review from jeremypw June 30, 2023 17:49
@jeremypw
Copy link
Collaborator

Would it be better to target this at make-compile otherwise it creates conflicts that need resolving and make it compile under Gtk4?

@danirabbit
Copy link
Member Author

@jeremypw ideally I’d like to reduce the size of #2225 which is why I’m targeting main. There’s a lot we could do so that we’re reviewing much smaller branches at a time and hopefully avoiding a lot of regressions. And then it’ll be a lot more feasible to actually review #2225 when the changes are smaller

@jeremypw
Copy link
Collaborator

jeremypw commented Jul 1, 2023

But this creates extra work keeping #2225 non-conflicting.

I cannot see a way of switching from Gtk3 to Gtk4 in one buildable commit while building all the UI without it being large.

If you want to work on main under Gtk3 then we had better close #2225 and start again once work on main is done.

@danirabbit
Copy link
Member Author

@jeremypw I think having a PR like #2225 is good to be able to see where we're needing to make changes, but there is a really a lot of things we could do to avoid regression and make the port much much smaller. Even if that's like a 3,000 line diff versus a 6,000 line diff I think in the long run this would save us a lot of time trying to hunt down bugs and regressions that could be avoided

@jeremypw jeremypw merged commit f5c2a29 into main Jul 2, 2023
@jeremypw jeremypw deleted the danirabbit/fileconflictdialog-gtk4prep branch July 2, 2023 09:27
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