Browse Source

Tooltip workaround no longer needed for gtk versions 3.24.38 and above. Also updated libclangmm submodule

merge-requests/413/head
eidheim 3 years ago
parent
commit
1eb1209f4e
  1. 2
      lib/libclangmm
  2. 2
      src/selection_dialog.cpp
  3. 2
      src/tooltips.cpp

2
lib/libclangmm

@ -1 +1 @@
Subproject commit 9567e2cb4e04d0239f3989e94857408bba51bbc3 Subproject commit 6282b516070757b5f28d0cc0c335c712446362ca

2
src/selection_dialog.cpp

@ -139,7 +139,7 @@ SelectionDialogBase::SelectionDialogBase(Source::BaseView *view_, const boost::o
} }
SelectionDialogBase::~SelectionDialogBase() { SelectionDialogBase::~SelectionDialogBase() {
#if defined(__APPLE__) && GTK_VERSION_GT_MICRO_CORRECTED(3, 24, 34) #if defined(__APPLE__) && GTK_VERSION_GT_MICRO_CORRECTED(3, 24, 34) && !GTK_VERSION_GT_MICRO_CORRECTED(3, 24, 37)
// Workaround for https://gitlab.gnome.org/GNOME/gtk/-/issues/5593 by keeping window alive slightly longer // Workaround for https://gitlab.gnome.org/GNOME/gtk/-/issues/5593 by keeping window alive slightly longer
window.close(); window.close();
Glib::signal_timeout().connect([window = std::make_shared<Gtk::Window>(std::move(window))] { return false; }, 5000); Glib::signal_timeout().connect([window = std::make_shared<Gtk::Window>(std::move(window))] { return false; }, 5000);

2
src/tooltips.cpp

@ -19,7 +19,7 @@ Tooltip::Tooltip(std::function<void(Tooltip &)> set_buffer_)
: view(nullptr), set_buffer(std::move(set_buffer_)) {} : view(nullptr), set_buffer(std::move(set_buffer_)) {}
Tooltip::~Tooltip() { Tooltip::~Tooltip() {
#if defined(__APPLE__) && GTK_VERSION_GT_MICRO_CORRECTED(3, 24, 34) #if defined(__APPLE__) && GTK_VERSION_GT_MICRO_CORRECTED(3, 24, 34) && !GTK_VERSION_GT_MICRO_CORRECTED(3, 24, 37)
// Workaround for https://gitlab.gnome.org/GNOME/gtk/-/issues/5593 by keeping window alive slightly longer // Workaround for https://gitlab.gnome.org/GNOME/gtk/-/issues/5593 by keeping window alive slightly longer
if(window) { if(window) {
window->close(); window->close();

Loading…
Cancel
Save