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

Adwaita window #3186

Merged
merged 13 commits into from
Mar 23, 2024
Merged

Adwaita window #3186

merged 13 commits into from
Mar 23, 2024

Conversation

amolenaar
Copy link
Member

@amolenaar amolenaar commented Mar 12, 2024

PR Type

What kind of change does this PR introduce?

  • Bug fix
  • Feature
  • Chore (refactoring, formatting, local variables, other cleanup)
  • Documentation content changes

What is the current behavior?

Issue Number: fixes #3177

What is the new behavior?

Use Adwaita's OverlaySplitView for the right side bar. The left side bar is still a Gtk.Paned, since that allows for resizing of the pane.

Adw.ToolbarView is used all over the place to have separated header bar sections.

Does this PR introduce a breaking change?

  • Yes
  • No

Other information

image

Extra: I added a fix so tests/run_with_merge_conflict.py does work on Gaphor.

@github-actions github-actions bot added the python Pull requests that update Python code label Mar 12, 2024
@amolenaar amolenaar marked this pull request as draft March 12, 2024 21:46
@github-actions github-actions bot added the packaging Update to packaging aspects label Mar 13, 2024
@amolenaar amolenaar force-pushed the adwaita-window branch 3 times, most recently from ba1eac2 to 4180e74 Compare March 15, 2024 19:22
@danyeaw
Copy link
Member

danyeaw commented Mar 18, 2024

@amolenaar I looked at this in both Linux and Windows, and I really like these proposed changes. They look modern and streamlined!

Alike Gaphor on Linux/GNOME.
@amolenaar
Copy link
Member Author

I think the window behaves as expected now.

image

@amolenaar
Copy link
Member Author

amolenaar commented Mar 21, 2024

I get errors while loading the mainwindow.ui file on multiple platforms.

Not sure why, though.

Current thread 0x00000001056b0600 (most recent call first):
  File "/Users/runner/work/gaphor/gaphor/.venv/lib/python3.11/site-packages/gi/overrides/Gtk.py", line 478 in add_from_string
  File "/Users/runner/work/gaphor/gaphor/gaphor/ui/mainwindow.py", line 37 in new_builder

On macOS, the tmp folder is in /var, but it
links to /private/var. The workdit is resolved to
/private/var/..., so we should do the same for the filename
we want to match.
Also for the merge request resolver, since the
sidebar will not automatically resize.
@amolenaar amolenaar marked this pull request as ready for review March 21, 2024 22:12
Decoration-layout needs at least a colon in the string.
@amolenaar amolenaar requested a review from danyeaw March 23, 2024 16:48
@danyeaw danyeaw added feature A new feature and removed python Pull requests that update Python code packaging Update to packaging aspects labels Mar 23, 2024
Copy link
Member

@danyeaw danyeaw left a comment

Choose a reason for hiding this comment

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

Thanks @amolenaar, this is really nice!

@danyeaw danyeaw merged commit ef96b7a into main Mar 23, 2024
19 checks passed
@danyeaw danyeaw deleted the adwaita-window branch March 23, 2024 23:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
feature A new feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Consider using raised toolbar styling
2 participants