mirror of
https://github.com/GraphiteEditor/Graphite.git
synced 2026-09-23 02:48:12 +08:00
Revamp the ColorPicker popover and ColorInput widget (#830)
* Add cancel hint to Eyedropper tool * Improve eyedropper overlay CSS * Make CSS for transparent checkered background reusable * Add color choice preview to color picker * Draw text and markers as contrasting white or black * Add reactive color updating and new/initial swapping * Add Hex, RGB, HSV, and Opacity inputs * Add none color and preset buttons * Add eyedropper button and fix alignment (now visually done) * Wire up none colors through the backend and style the ColorInput widget * Add color info chip to ColorInput widget * Fix all UX bugs * Add more tooltips * Fix FloatingMenu recursive loop * Prevent mouse stray from closing color picker while dragging pickers Closes #703 * Fix deselect all layers shortcut * Add temporary eyedropper for Chromium browsers and a coming soon fallback
This commit is contained in:
@@ -300,16 +300,10 @@ impl Stroke {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn with_color(mut self, color: &Option<String>) -> Option<Self> {
|
||||
if let Some(color) = color {
|
||||
Color::from_rgba_str(color).or_else(|| Color::from_rgb_str(color)).map(|color| {
|
||||
self.color = Some(color);
|
||||
self
|
||||
})
|
||||
} else {
|
||||
self.color = None;
|
||||
Some(self)
|
||||
}
|
||||
pub fn with_color(mut self, color: &Option<Color>) -> Option<Self> {
|
||||
self.color = *color;
|
||||
|
||||
Some(self)
|
||||
}
|
||||
|
||||
pub fn with_weight(mut self, weight: f64) -> Self {
|
||||
|
||||
Reference in New Issue
Block a user