mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-08-07 22:14:00 -06:00
merge upstream changes (#25)
* Add sigxcpu76's fix to force use of light GTK theme When using Bambu Studio with a dark themed Linux desktop, many of the dialogs appear as white text on a white background (font's correctly invert, but dialogs remain white). @sigxcpu76 provided a workaround for this in #12 which is to tell the app to use a light GTK theme. This change incorporates that workaround into the AppImage making the app more usable until such time as proper dark theme support can be added to Bambu Studio. * Update Containerfile to make it Docker compatible - Replace COPY command with Docker compatible syntax - Rename container tag to bambu-studio-builder so as to not confuse with a container that would actually run Bambu Studio - Add Docker alternative build method (thx @SG-R) - Update podman syntax to remove unnecessary sudo * Add check_available_memory_and_disk to BuildLinux.sh * Fixes #740 Removing check for local or Remote FX virtualized RDP session. The checks below this line already verify if proper OpenGL support is present. Co-authored-by: deftdawg <deftdawg@gmail.com> Co-authored-by: hifihedgehog <16614343+hifihedgehog@users.noreply.github.com>
This commit is contained in:
parent
cad4caaf5b
commit
ea5c88e36f
4 changed files with 34 additions and 7 deletions
|
@ -250,9 +250,6 @@ int wmain(int argc, wchar_t **argv)
|
|||
bool load_mesa =
|
||||
// Forced from the command line.
|
||||
force_mesa ||
|
||||
// Running over a rempote desktop, and the RemoteFX is not enabled, therefore Windows will only provide SW OpenGL 1.1 context.
|
||||
// In that case, use Mesa.
|
||||
::GetSystemMetrics(SM_REMOTESESSION) ||
|
||||
// Try to load the default OpenGL driver and test its context version.
|
||||
! opengl_version_check.load_opengl_dll() || ! opengl_version_check.is_version_greater_or_equal_to(2, 0);
|
||||
#endif /* SLIC3R_GUI */
|
||||
|
|
|
@ -43,6 +43,8 @@ export LD_LIBRARY_PATH="\$DIR/bin"
|
|||
# 1) BambuStudio will segfault on systems where locale info is not as expected (i.e. Holo-ISO arch-based distro)
|
||||
# 2) BambuStudio will segfault with a boost logging error if ~/.config/BambuStudio doesn't exist on first run
|
||||
export LC_ALL=C
|
||||
# FIXME: BambuStudio doesn't respect dark mode; use GTK_THEME workaround from sigxcpu76 │
|
||||
export GTK_THEME=Adwaita:light
|
||||
mkdir -p \${HOME}/.config/BambuStudio/ 2> /dev/null
|
||||
|
||||
exec "\$DIR/bin/@SLIC3R_APP_CMD@" "\$@"
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue