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.

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

Dark mode fixes #4860

Closed
wants to merge 14 commits into from
Closed

Conversation

jamincollins
Copy link
Contributor

@jamincollins jamincollins commented Apr 3, 2024

Description

This fixes issues with the print settings tabs on both Linux and Mac.

Screenshots/Recordings/Graphs

Before:
image
image
image

After:
image
image
image

Tests

Built and tested on both (Arch) Linux and Mac.

@jamincollins
Copy link
Contributor Author

The last lines of the failed workflow action look like a successful build to me:

ld: warning: direct access in function '___cxx_global_var_init.4' from file '/Users/runner/work/OrcaSlicer/OrcaSlicer/deps/build_x86_64/OrcaSlicer_dep_x86_64/usr/local/lib/libboost_thread.a(thread.cpp.o)' to global weak symbol 'boost::exception_detail::exception_ptr_static_exception_objectboost::exception_detail::bad_exception_::e' from file 'src/libslic3r/liblibslic3r.a(utils.cpp.o)' means the weak symbol cannot be overridden at runtime. This was likely caused by different translation units being compiled with different visibility settings.
ld: warning: direct access in function '___cxx_global_var_init.4' from file '/Users/runner/work/OrcaSlicer/OrcaSlicer/deps/build_x86_64/OrcaSlicer_dep_x86_64/usr/local/lib/libboost_thread.a(thread.cpp.o)' to global weak symbol 'guard variable for boost::exception_detail::exception_ptr_static_exception_objectboost::exception_detail::bad_exception_::e' from file 'src/libslic3r/liblibslic3r.a(utils.cpp.o)' means the weak symbol cannot be overridden at runtime. This was likely caused by different translation units being compiled with different visibility settings.
Verify localization with gettext...
./run_gettext.sh: working dir = /Users/runner/work/OrcaSlicer/OrcaSlicer
Fix macOS app package...

I don't see a way to re-run it myself.

@discip
Copy link
Contributor

discip commented Apr 4, 2024

Finally!

Thank you so much! 🤝 😃👍 🎉

@@ -2754,7 +2754,7 @@ void GUI_App::init_label_colours()
m_color_label_modified = is_dark_mode ? wxColour("#F1754E") : wxColour("#F1754E");
m_color_label_sys = is_dark_mode ? wxColour("#B2B3B5") : wxColour("#363636");

#ifdef _WIN32
#if defined(_WIN32) || defined(__linux__) || defined(__APPLE__)
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm just wondering if we even need this #if here, since every operating system is affected.
Or are there more OS'es than Linux, Windows & Mac? 😊 🤷‍♂️

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I agree that it probably isn't needed. And I'm happy to remove it if desired.

Copy link
Contributor

Choose a reason for hiding this comment

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

I suggest to let @SoftFever have a look. 😊

@discip
Copy link
Contributor

discip commented Apr 4, 2024

Unfortunately there is more:

image

image

#3417
image

image

@jamincollins
Copy link
Contributor Author

Unfortunately there is more:

I'm aware there are more, that is why this commit message specifically only mentions the tabs.

I'm still tracking down the other areas.

@jamincollins
Copy link
Contributor Author

jamincollins commented Apr 4, 2024

These are the areas I've identified as needing to be fixed:

  • Print settings
  • Rename plate
  • Export Configs
  • Network Test (output)
  • Unsaved Changes
    • UnsavedChangesDialog.cpp
  • "Send G-Code to printer host"

I'll add to the list as I find them and fix them.

@discip
Copy link
Contributor

discip commented Apr 4, 2024

that is why this commit message specifically only mentions the tabs.

Oh, sorry, was not aware of that. 🤦🏻

I'll add to the list as I find them and fix them.

Great views! 👍

@yw4z
Copy link
Contributor

yw4z commented Apr 5, 2024

3882
3667
this 2 might be related

@jamincollins
Copy link
Contributor Author

3882 3667 this 2 might be related

I'll make sure these are on my list of areas to dig into

@discip
Copy link
Contributor

discip commented Apr 5, 2024

@jamincollins

  • Print settings

  • Rename plate

  • Export Configs

  • Network Test (output)

  • Unsaved Changes

    • UnsavedChangesDialog.cpp
  • "Send G-Code to printer host"

Maybe you could put these into the initial post, so the progress can be monitored easier. 😊

@jamincollins
Copy link
Contributor Author

I'd rather get the fixes committed and merged as completed than wait for all to be found. I don't mind having a main tracking ticket, but it may take me some time to get to all of them.

@jamincollins jamincollins mentioned this pull request Apr 5, 2024
11 tasks
@jamincollins
Copy link
Contributor Author

I've added several more fixes for light/dark mode issues:

Custom G-Code Editor

Before:
custom-gcode-before

After:
custom-gcode-after

Export Configs

Before:
export-configs-before

After:
export-configs-after

Network Test

Before:
network-test-before

After:
network-test-after
network-test-after2

Printer settings

Before:
printer-settings-xy-before
printer-settings-extruder-xy-before

After:
printer-settings-xy-after
printer-settings-extruder-xy-after

Rename Plate

Before:
rename-plate-before

After:
rename-plate-after

Send G-Code

Before:
send-gcode-before

After:
send-gcode-after

Unsaved Changes

Before:
unsaved-changes-before

After:
unsaved-changes-after

@discip
Copy link
Contributor

discip commented Apr 12, 2024

@jamincollins
But the actual g-code (2nd screenshot) is still black. Maybe you could fix that as well.

@jamincollins
Copy link
Contributor Author

Yes, trying to track it down. But it is better than before. And additions to it are white.

@discip
Copy link
Contributor

discip commented Apr 12, 2024

But it is better than before.

Definitely!

@jamincollins
Copy link
Contributor Author

Closing this PR in favor of a slightly different (and IMO better) approach.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants