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

fix: colorpicker move on input #656

Merged
merged 15 commits into from
Mar 12, 2024
Merged

fix: colorpicker move on input #656

Changes from 13 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
13cc5d4
Add copy code function to Color Picker
leewyatt Jan 26, 2022
055c923
Modify to not return null and Fix #503
leewyatt Jan 30, 2022
523e182
Merge branch 'gluonhq:master' into master
leewyatt Jan 30, 2022
89b0721
Add licenses and tests
leewyatt Feb 5, 2022
40ac673
update licenses
leewyatt Feb 5, 2022
0abe3b0
Remove extra blank lines, remove null
leewyatt Feb 7, 2022
6e6d28d
Merge branch 'gluonhq:master' into master
leewyatt Feb 7, 2022
3d149cc
Update to JUnit 5 API
AlmasB Feb 18, 2022
14894ac
Merge branch 'master' of https://github.com/leewyatt/scenebuilder
leewyatt Oct 3, 2023
9a721c9
Prevent ColorPicker area from moving on mouse scroll and keyboard inp…
leewyatt Oct 3, 2023
6a2d4ff
Remove extraneous whitespace line
leewyatt Oct 3, 2023
24edf0a
Merge branch 'gluonhq:master' into fix-colorpicker-move-on-input
leewyatt Mar 11, 2024
4ecea8e
Refactored code placement and added comments as per review feedback.
leewyatt Mar 11, 2024
b572ee6
Update kit/src/main/java/com/oracle/javafx/scenebuilder/kit/util/cont…
leewyatt Mar 12, 2024
464a1da
updated copyright
leewyatt Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .../com/oracle/javafx/scenebuilder/kit/util/control/paintpicker/colorpicker/ColorPicker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
import com.oracle.javafx.scenebuilder.kit.util.control.paintpicker.gradientpicker.GradientPickerStop;
import javafx.beans.value.ChangeListener;
import javafx.event.ActionEvent;
import javafx.event.Event;
import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
import javafx.geometry.Bounds;
Expand All @@ -48,7 +49,9 @@
import javafx.scene.control.TextField;
import javafx.scene.input.Clipboard;
import javafx.scene.input.ClipboardContent;
import javafx.scene.input.KeyEvent;
import javafx.scene.input.MouseEvent;
import javafx.scene.input.ScrollEvent;
import javafx.scene.layout.Region;
import javafx.scene.layout.StackPane;
import javafx.scene.layout.VBox;
Expand Down Expand Up @@ -155,6 +158,7 @@ private void initialize() {
assert green_textfield != null;
assert blue_textfield != null;
assert alpha_slider != null;
assert picker_scrollpane != null;

hue_slider.setStyle(makeHueSliderCSS()); // Make the grad for hue slider

Expand Down Expand Up @@ -252,6 +256,11 @@ private void initialize() {
picker_region.pressedProperty().addListener(liveUpdateListener);
hue_slider.pressedProperty().addListener(liveUpdateListener);
alpha_slider.pressedProperty().addListener(liveUpdateListener);

// Fix ColorPicker movement on focus. Now blocks scroll and key events (Home, End, PgUp, PgDn, arrows) to keep it static. For issue #654.
leewyatt marked this conversation as resolved.
Show resolved Hide resolved
picker_scrollpane.addEventFilter(KeyEvent.ANY, Event::consume);
picker_scrollpane.addEventFilter(ScrollEvent.SCROLL, Event::consume);

// paint combobox add values
paintCombobox.getItems().setAll(CSS_CODE, JAVA_CODE);
paintCombobox.getSelectionModel().select(0);
Expand Down