Fix for incorrect text fitting on gtk comboboxes.

fixes #4584
This commit is contained in:
tamasmeszaros 2021-01-07 13:38:16 +01:00
parent a5882a1a1c
commit 2505c0a82d
3 changed files with 74 additions and 21 deletions

View file

@ -256,11 +256,11 @@ if (SLIC3R_PCH AND NOT SLIC3R_SYNTAXONLY)
add_precompiled_header(libslic3r_gui pchheader.hpp FORCEINCLUDE)
endif ()
target_include_directories(libslic3r_gui PUBLIC /usr/include/glib-2.0)
target_include_directories(libslic3r_gui PUBLIC /usr/lib/glib-2.0/include)
target_include_directories(libslic3r_gui PUBLIC /usr/include/pango-1.0)
target_include_directories(libslic3r_gui PUBLIC /usr/include/harfbuzz)
target_include_directories(libslic3r_gui PUBLIC /usr/include/gtk-3.0/)
target_include_directories(libslic3r_gui PUBLIC /usr/include/cairo/)
target_include_directories(libslic3r_gui PUBLIC /usr/include/gdk-pixbuf-2.0/)
target_include_directories(libslic3r_gui PUBLIC /usr/include/atk-1.0/)
# We need to implement some hacks for wxWidgets and touch the underlying GTK
# layer and sub-libraries. This forces us to use the include locations of these
# libraries. No need to link to them, wxWidgets does that already.
# See PresetComboBox.cpp for the includes and subsequent workarounds.
if (UNIX AND NOT APPLE)
find_package(GTK${SLIC3R_GTK} REQUIRED)
target_include_directories(libslic3r_gui PRIVATE ${GTK${SLIC3R_GTK}_INCLUDE_DIRS})
endif ()