Browse Source

Overlay fix: drag and drop should now work again

merge-requests/365/head
eidheim 10 years ago
parent
commit
d60dc40fed
  1. 2
      src/terminal.cc
  2. 8
      src/window.cc
  3. 2
      src/window.h

2
src/terminal.cc

@ -312,7 +312,7 @@ void Terminal::async_print(size_t line_nr, const std::string &message) {
}
void Terminal::configure() {
#if GTKMM_MAJOR_VERSION>3 || (GTKMM_MAJOR_VERSION>=3 && GTKMM_MINOR_VERSION>=12)
#if GTKMM_MAJOR_VERSION>3 || (GTKMM_MAJOR_VERSION==3 && GTKMM_MINOR_VERSION>=12)
link_tag->property_foreground_rgba()=get_style_context()->get_color(Gtk::StateFlags::STATE_FLAG_LINK);
#endif

8
src/window.cc

@ -56,12 +56,18 @@ Window::Window() : notebook(Notebook::get()) {
terminal_vbox.pack_end(info_and_status_hbox, Gtk::PACK_SHRINK);
vpaned.pack2(terminal_vbox, true, true);
#if GTKMM_MAJOR_VERSION>3 || (GTKMM_MAJOR_VERSION>=3 && GTKMM_MINOR_VERSION>=18)
#if GTKMM_MAJOR_VERSION>3 || (GTKMM_MAJOR_VERSION==3 && GTKMM_MINOR_VERSION>=14)
overlay_vbox.set_hexpand(false);
overlay_vbox.set_halign(Gtk::Align::ALIGN_START);
overlay_hbox.set_hexpand(false);
overlay_hbox.set_halign(Gtk::Align::ALIGN_END);
overlay_vbox.pack_start(Info::get(), Gtk::PACK_SHRINK, 20);
overlay_hbox.pack_end(overlay_vbox, Gtk::PACK_SHRINK, 20);
overlay.add(vpaned);
overlay.add_overlay(overlay_hbox);
#if GTKMM_MAJOR_VERSION>3 || (GTKMM_MAJOR_VERSION==3 && GTKMM_MINOR_VERSION>=18)
overlay.set_overlay_pass_through(overlay_hbox, true);
#endif
add(overlay);
#else
add(vpaned);

2
src/window.h

@ -29,7 +29,7 @@ private:
Gtk::HBox info_and_status_hbox;
Gtk::VBox overlay_vbox;
Gtk::HBox overlay_hbox;
#if GTKMM_MAJOR_VERSION>3 || (GTKMM_MAJOR_VERSION>=3 && GTKMM_MINOR_VERSION>=18)
#if GTKMM_MAJOR_VERSION>3 || (GTKMM_MAJOR_VERSION==3 && GTKMM_MINOR_VERSION>=14)
Gtk::Overlay overlay;
#endif
Gtk::AboutDialog about;

Loading…
Cancel
Save