Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Use material design theme #941

Merged
merged 15 commits into from
Aug 17, 2020

Conversation

SamCarlberg
Copy link
Member

@SamCarlberg SamCarlberg commented Apr 20, 2019

Closes #664

Makes dialogs appear centered on the main window, instead of centered on the primary screen (which was a problem on multi-monitor setups)

Screenshots

Empty window
Empty

Pipeline
Pipeline

Step detail
HSL Threshold

Palette
Palette

Analysis dialog
Pipeline Analysis_005

Deploy dialog
For reference only, since deploy is going to be removed
Deploy_008

Exception alert
IllegalStateException_009

@JLLeitschuh
Copy link
Member

Well, that's different. Not bad though. Is there a dark mode? Lol

@@ -9,7 +9,7 @@
<?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.StackPane?>
<HBox styleClass="socket"
fx:controller="edu.wpi.grip.ui.OperationController"
fx:controller="edu.wpi.grip.ui.pipeline.OutputSocketController"
Copy link
Member

Choose a reason for hiding this comment

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

?

Copy link
Member Author

Choose a reason for hiding this comment

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

fx:controller is necessary, and OperationController is for controlling the UI element displaying an entire operation. OutputSocketController is more appropriate.

This also makes the file in line with InputSocket.fxml, which already uses InputSocketController as its fx:controller attribute

Copy link
Member

@JLLeitschuh JLLeitschuh left a comment

Choose a reason for hiding this comment

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

LGTM after my questions are resolved.

@SamCarlberg
Copy link
Member Author

No dark mode yet. Maybe later

Makes it so that the default dialog size won't result in (small) scroll bars and text overruns.
Was caused by removing the stylesheet from MainWindow.fxml
@codecov-io
Copy link

Codecov Report

Merging #941 into master will decrease coverage by 0.12%.
The diff coverage is 6.66%.

@@             Coverage Diff              @@
##             master     #941      +/-   ##
============================================
- Coverage     52.89%   52.76%   -0.13%     
  Complexity        1        1              
============================================
  Files           327      327              
  Lines          8852     8877      +25     
  Branches        560      561       +1     
============================================
+ Hits           4682     4684       +2     
- Misses         3966     3989      +23     
  Partials        204      204

Copy link
Member

@JLLeitschuh JLLeitschuh left a comment

Choose a reason for hiding this comment

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

LGTM!

Use a hard color border instead of a guassian shadow (which looked like a fuzzy border as well as undesirably shading the button icons)
@JLLeitschuh
Copy link
Member

@SamCarlberg can this be merged?

Copy link
Member

@JLLeitschuh JLLeitschuh left a comment

Choose a reason for hiding this comment

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

Just tried this out locally, and it works. Looks good! Nice work! Sorry for taking so long to merge.

@JLLeitschuh JLLeitschuh merged commit 2771bb8 into WPIRoboticsProjects:master Aug 17, 2020
# for free to join this conversation on GitHub. Already have an account? # to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Epic: Use Material Design for GRIP UI
3 participants