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

Analog Clock Win 95 Style #6760

Merged
merged 3 commits into from
May 9, 2021
Merged

Conversation

ReasonablePanic
Copy link
Contributor

Here is my draft for the Analog Clock.

It's modeled after the classic windows clock but it's not a direct copy.
If there is any feature from the original that is wanted, let me know. A drop shadow for instance, is trivial to implement but I left it out due to the cost in performance at, in my opinion, no great benefit to the design/look.

There seems to be some kind of issue with the way the Gfx lib fills the path leaving an off pixel at certain times. Probably due to the conversion between float -> int. If there is something I can do to mitigate this in my current code, again, let me know :) As it stands it's not a huge problem, but another way in which it differs from the windows 95 version.

Samples:

Screenshot_20210430_211226
Screenshot_20210430_211253
Screenshot_20210430_211308

@bgianfo
Copy link
Member

bgianfo commented May 1, 2021

You'll want to rebase to avoid the merge commits in your PR, and then squash all of the small "fix up" commits into their suitable parent commit.
See: CONTRIBUTING.md

@pakerwreah
Copy link
Contributor

pakerwreah commented May 1, 2021

git rebase -i HEAD~N # N being the number of commits
keep the commits you want with the keyword pick and the rest change to squash or fixup

# squash = use commit, but meld into previous commit
# fixup = like "squash", but discard this commit's log message

git push --force

Copy link
Collaborator

@bcoles bcoles left a comment

Choose a reason for hiding this comment

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

Looks good to me. Minor comments about code style.

Please squash and rebase.

Userland/Applications/AnalogClock/AnalogClock.cpp Outdated Show resolved Hide resolved
Userland/Applications/AnalogClock/AnalogClock.cpp Outdated Show resolved Hide resolved
Userland/Applications/AnalogClock/AnalogClock.cpp Outdated Show resolved Hide resolved
@ReasonablePanic
Copy link
Contributor Author

Looks good to me. Minor comments about code style.

Please squash and rebase.

Hey! thank you for your time! :)
squash all into one right?

Userland/Applications/AnalogClock/main.cpp Outdated Show resolved Hide resolved
Userland/Applications/AnalogClock/main.cpp Outdated Show resolved Hide resolved
Userland/Applications/AnalogClock/main.cpp Outdated Show resolved Hide resolved
Userland/Applications/AnalogClock/main.cpp Show resolved Hide resolved
Userland/Applications/AnalogClock/AnalogClock.cpp Outdated Show resolved Hide resolved
Userland/Applications/AnalogClock/AnalogClock.h Outdated Show resolved Hide resolved
Userland/Applications/AnalogClock/AnalogClock.h Outdated Show resolved Hide resolved
Userland/Applications/AnalogClock/main.cpp Outdated Show resolved Hide resolved
@awesomekling awesomekling merged commit 4c43fc0 into SerenityOS:master May 9, 2021
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.

None yet

5 participants