Skip to content

improve color support for themes#590

Merged
jacobperron merged 4 commits intoros2:ros2from
mikeferguson:port_melodic_1319
Aug 20, 2020
Merged

improve color support for themes#590
jacobperron merged 4 commits intoros2:ros2from
mikeferguson:port_melodic_1319

Conversation

@mikeferguson
Copy link
Copy Markdown
Contributor

@mikeferguson
Copy link
Copy Markdown
Contributor Author

This makes dark mode look good on Mac. Before:
2020-08-10-dark-mode

After:
Screen Shot 2020-08-09 at 7 05 25 PM

Also tested against regular mode, all looks good (and this is merged into Melodic)

@mikeferguson
Copy link
Copy Markdown
Contributor Author

CI appears to be broken due to #589 (seems that the resource_retriever package hasn't been re-released yet with those changes)

@clalancette
Copy link
Copy Markdown
Contributor

CI appears to be broken due to #589 (seems that the resource_retriever package hasn't been re-released yet with those changes)

Yeah, we need to release a new resource_retriever and a new rviz2.

@clalancette
Copy link
Copy Markdown
Contributor

@ros-pull-request-builder retest this please

@clalancette
Copy link
Copy Markdown
Contributor

@mikeferguson FYI, the current failures look to be style failures with this patch.

@mikeferguson
Copy link
Copy Markdown
Contributor Author

@clalancette style fixes are fixed - but there's some weird failure I can't seem to figure out:

WARNING: The converted file for the input file '/home/jenkins-agent/workspace/Rpr__rviz__ubuntu_focal_amd64/ws/test_results/rviz2/Testing/20200814-1326/Test.xml' doesnt match the JUnit format.
09:26:57 WARNING: At line 2 of file:/home/jenkins-agent/workspace/Rpr__rviz__ubuntu_focal_amd64/generatedJUnitFiles/4c631cba-8659-477a-bd2f-9af6c0c9a750/GoogleTest/TEST-3d6e02d0-4e95-4845-9763-7699c02eb1d7.xml:Premature end of file.
09:26:57 WARNING: Technical validation:Premature end of file.
09:26:57 ERROR: Premature end of file.
09:26:57 ERROR: Premature end of file.
09:26:57 ERROR: Step ‘Publish xUnit test result report’ failed: The converted file for the result file '/home/jenkins-agent/workspace/Rpr__rviz__ubuntu_focal_amd64/ws/test_results/rviz2/Testing/20200814-1326/Test.xml' (during conversion process for the metric 'GoogleTest') is not valid. The report file has been skipped.

@clalancette
Copy link
Copy Markdown
Contributor

@clalancette style fixes are fixed - but there's some weird failure I can't seem to figure out:

Yeah, sorry, we are having some infrastructure issues at the moment. Those should be fixed once ros-infrastructure/ros_buildfarm#828 is merged. If that is the only failure, then you are good to go.

@mikeferguson
Copy link
Copy Markdown
Contributor Author

@clalancette -- thanks for the quick feedback -- yeah that appears to be the only issue (I had forgotten to lint before opening the PR - thos issues are fixed).

@dirk-thomas
Copy link
Copy Markdown
Member

@ros-pull-request-builder retest this please

@mikeferguson
Copy link
Copy Markdown
Contributor Author

@clalancette tests are now passing!

Copy link
Copy Markdown
Member

@jacobperron jacobperron left a comment

Choose a reason for hiding this comment

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

LGTM

  • Linux Build Status
  • Linux-aarch64 Build Status
  • macOS Build Status
  • Windows Build Status

@jacobperron jacobperron added the enhancement New feature or request label Aug 19, 2020
#else
return QColor(Qt::gray);
#endif
if (role == Qt::TextColorRole && parent_ && parent_->getDisableChildren()) {
Copy link
Copy Markdown
Member

@jacobperron jacobperron Aug 19, 2020

Choose a reason for hiding this comment

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

The Windows build is complaining that Qt::TextColorRole is deprecated.
Docs suggest changing this to Qt::ForegroundRole.

Copy link
Copy Markdown
Contributor Author

@mikeferguson mikeferguson Aug 19, 2020

Choose a reason for hiding this comment

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

Looks right to me on the Mac - want to rerun the other tests?

@jacobperron
Copy link
Copy Markdown
Member

Windows: Build Status

@jacobperron jacobperron merged commit c4e28db into ros2:ros2 Aug 20, 2020
@jacobperron
Copy link
Copy Markdown
Member

@mikeferguson thanks!

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

Labels

enhancement New feature or request

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants