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.

Sign up for GitHub

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

Jump to bottom

Add a ColorPicker-Control #3930

Merged
merged 32 commits into from
Nov 10, 2020
Merged

Add a ColorPicker-Control #3930

merged 32 commits into from
Nov 10, 2020

Conversation

timunie
Copy link
Collaborator

@timunie timunie commented Oct 2, 2020 •
edited by punker76
Loading

Describe the changes you have made to improve this project

  • Added a ColorEyeDropper - Control: The user can pick a color from the screen
  • Added a ColorPalette - Control: The user can select any predefined color
  • Added a ColorCanvas - Control: The user can create any color by providing either ARGB or AHSV
  • Added a ColorPicker - Control: All above controls connected

Additional context

A cleaned version of this PR: #3710

The control in action

mahapps_colorpicker2

Closed Issues

Closes #3920
Closes #3520
Closes #3710

@timunie timunie mentioned this pull request Oct 2, 2020
Closed
3 tasks
@AKruimink
Copy link

Question, potentialy unrelated to the color picker (nice job btw), when you change the color in the gif to green the text in the application jumps to black, but the header text of the color picker control stays white, did you by any change miss setting the text color dynamicly?

@timunie timunie mentioned this pull request Oct 9, 2020
Merged
@punker76 punker76 force-pushed the ColorPicker_Cleaned branch 3 times, most recently from a01dc9d to 5fbbc32 Compare October 24, 2020 21:17
@punker76 punker76 force-pushed the ColorPicker_Cleaned branch 2 times, most recently from 02f2cf2 to 11ba3f2 Compare November 7, 2020 17:28
timunie and others added 13 commits November 8, 2020 12:21
@timunie @punker76
Implementing the base classes
93c1fb5
@timunie @punker76
Translations for WPF Build-In Colors
966574f 
for now we have:
- English
- German
@timunie @punker76
Implement ColorEyeDropper
109663e 
With the EyeDropper one can Pick any color from the screen. 
This Control is used by the ColorCanvas and ColorPicker
@timunie @punker76
Implement ColorCanvas
295f98d 
- Select Color by ARGB
- Select Color by HSV
- Select Color by typing the Name
@timunie @punker76
Implement ColorPalette
dd01c5e 
- Adds a special ListView to show predefined Colors
@timunie @punker76
Implement ColorPicker
d419d46
@timunie @punker76
Some Improvements and BugFixes
2dd2dff 
Some Improvements and Bugfixes

- EyeDropper is more stable
- ColorCanvas sometimes lost the MouseCapture
- ColorPicker didn't get the Theme applied
@timunie @punker76
Add an Example to the Demo
b65e031
@timunie @punker76
Prevent ColorPicker from loosing the selected color and some Styling
a16bda1 
improvements
@timunie @punker76
Some codacy fixes
87831e2
@timunie @punker76
Some codacy fixes
3b67e30
@timunie @punker76
Remove invalid colors from the ResourceDictionary
beafd1e
@punker76
Update xmlns and XmlnsDefinition
bd70a44
@punker76 punker76 added this to the 2.4.0 milestone Nov 10, 2020
@punker76 punker76 self-requested a review November 10, 2020 16:49
punker76
punker76 reviewed Nov 10, 2020
View reviewed changes
Copy link
Member

@punker76 punker76 left a comment

Choose a reason for hiding this comment

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

LGTM 👍

src/MahApps.Metro/Controls/ColorPicker/ColorHelper.cs Outdated Show resolved Hide resolved
src/MahApps.Metro/Controls/ColorPicker/ColorPickerBase.cs Show resolved Hide resolved
@punker76 punker76 changed the title [RFC] Add a ColorPicker-Control Add a ColorPicker-Control Nov 10, 2020
@punker76 punker76 merged commit 5d70fcc into MahApps:develop Nov 10, 2020
@punker76
Copy link
Member

@timunie your changes have been merged, thanks for your contribution 👍

It would be nice that you also write the documentation for this new stuff at the doc repo ;-)

punker76 added a commit that referenced this pull request Nov 11, 2020
@punker76
(GH-3930) Remove MaxDropDownHeight and MaxDropDownWidth
6a53c8c
punker76 added a commit that referenced this pull request Nov 11, 2020
@punker76
(GH-3930) Fix comments
1f1819a
punker76 added a commit that referenced this pull request Nov 11, 2020
@punker76
(GH-3930) Fix comments
874cf24
punker76 added a commit that referenced this pull request Nov 11, 2020
@punker76
(GH-3930) Fix recent colors
2ab3d8c
@timunie timunie deleted the ColorPicker_Cleaned branch November 15, 2020 15:31
@seba30
Copy link

seba30 commented Jan 8, 2021

Hey there,

I use the ColorCanvas to adjust the LED color on our devices. Sadly I can't find a DP (or maybe I'm too stupid) to disable the following:

  • Alpha channel (makes no sense here in my case)
  • HSV
  • Name

It would be great, if you plan to develop and integrate these features in the future.

Thank you!

@punker76
Copy link
Member

punker76 commented Jan 8, 2021

@seba30 I had the same idea, but didn't create an issue for it. So it would be nice if you can create one :-D

@seba30
Copy link

seba30 commented Jan 8, 2021

Issue #4020

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

@punker76 punker76 punker76 left review comments

Assignees
No one assigned
Labels
Feature
Milestone
2.4.0
Development

Successfully merging this pull request may close these issues.

Colorpicker ColorPicker Control
4 participants
@timunie @AKruimink @punker76 @seba30