X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fgtkmm2ext%2Ftearoff.cc;h=bb30e5610f64d60181b20beb73442d6eb8b41370;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=be3bfe4113fbdedfb01f11d4829ab88ce8bae541;hpb=bc89fe0147c04b67141936d109c00dfd4d69cc4b;p=ardour.git diff --git a/libs/gtkmm2ext/tearoff.cc b/libs/gtkmm2ext/tearoff.cc index be3bfe4113..bb30e5610f 100644 --- a/libs/gtkmm2ext/tearoff.cc +++ b/libs/gtkmm2ext/tearoff.cc @@ -1,6 +1,6 @@ /* Copyright (C) 2003 Paul Barton-Davis - + This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or @@ -19,8 +19,14 @@ */ #include -#include -#include +#include + +#include "pbd/xml++.h" + +#include "gtkmm2ext/tearoff.h" +#include "gtkmm2ext/utils.h" + +#include "pbd/i18n.h" using namespace Gtkmm2ext; using namespace Gtk; @@ -29,50 +35,61 @@ using namespace Glib; using namespace std; TearOff::TearOff (Widget& c, bool allow_resize) - : contents (c), - own_window (Gtk::WINDOW_TOPLEVEL), - tearoff_arrow (ARROW_DOWN, SHADOW_OUT), - close_arrow (ARROW_UP, SHADOW_OUT) + : contents (c) + , own_window (Gtk::WINDOW_TOPLEVEL) + , tearoff_arrow (ARROW_DOWN, SHADOW_OUT) + , close_arrow (ARROW_UP, SHADOW_OUT) + , dragging (false) + , _visible (true) + , _torn (false) + , _can_be_torn_off (true) + { - dragging = false; - _visible = true; - _can_be_torn_off = true; + own_window_width = 0; + own_window_height = 0; + own_window_xpos = 0; + own_window_ypos = 0; tearoff_event_box.add (tearoff_arrow); tearoff_event_box.set_events (BUTTON_PRESS_MASK|BUTTON_RELEASE_MASK); tearoff_event_box.signal_button_release_event().connect (mem_fun (*this, &TearOff::tearoff_click)); + tearoff_event_box.set_tooltip_text (_("Click to tear this into its own window")); + close_event_box.add (close_arrow); close_event_box.set_events (BUTTON_PRESS_MASK|BUTTON_RELEASE_MASK); close_event_box.signal_button_release_event().connect (mem_fun (*this, &TearOff::close_click)); - - own_window.add_events (BUTTON_PRESS_MASK|BUTTON_RELEASE_MASK|POINTER_MOTION_MASK|POINTER_MOTION_HINT_MASK); - own_window.set_resizable (allow_resize); - own_window.set_type_hint (WINDOW_TYPE_HINT_TOOLBAR); - + + close_event_box.set_tooltip_text (_("Click to put this back in the main window")); + VBox* box1; box1 = manage (new VBox); box1->pack_start (close_event_box, false, false, 2); - + window_box.pack_end (*box1, false, false, 2); + + own_window.add_events (KEY_PRESS_MASK|KEY_RELEASE_MASK|BUTTON_PRESS_MASK|BUTTON_RELEASE_MASK|POINTER_MOTION_MASK|POINTER_MOTION_HINT_MASK); + own_window.set_resizable (allow_resize); + own_window.set_type_hint (WINDOW_TYPE_HINT_UTILITY); + own_window.add (window_box); - + own_window.signal_button_press_event().connect (mem_fun (*this, &TearOff::window_button_press)); own_window.signal_button_release_event().connect (mem_fun (*this, &TearOff::window_button_release)); own_window.signal_motion_notify_event().connect (mem_fun (*this, &TearOff::window_motion)); own_window.signal_delete_event().connect (mem_fun (*this, &TearOff::window_delete_event)); - own_window.signal_realize().connect (bind (sigc::ptr_fun (Gtkmm2ext::set_decoration), &own_window, WMDecoration (DECOR_BORDER|DECOR_RESIZEH))); + own_window.signal_realize().connect (sigc::mem_fun (*this, &TearOff::own_window_realized)); + own_window.signal_configure_event().connect (sigc::mem_fun (*this, &TearOff::own_window_configured), false); tearoff_arrow.set_name ("TearOffArrow"); close_arrow.set_name ("TearOffArrow"); VBox* box2; box2 = manage (new VBox); - box2->pack_start (tearoff_event_box, false, false, 2); + box2->pack_start (tearoff_event_box, false, false); pack_start (contents); - pack_start (*box2, false, false, 2); - + pack_start (*box2, false, false); } TearOff::~TearOff () @@ -95,15 +112,15 @@ TearOff::set_can_be_torn_off (bool yn) } void -TearOff::set_visible (bool yn) +TearOff::set_visible (bool yn, bool force) { /* don't change visibility if torn off */ - if (own_window.is_visible()) { + if (_torn) { return; } - if (_visible != yn) { + if (_visible != yn || force) { _visible = yn; if (yn) { show_all(); @@ -116,32 +133,63 @@ TearOff::set_visible (bool yn) } gint -TearOff::tearoff_click (GdkEventButton* ev) -{ - if (_can_be_torn_off) { - remove (contents); - window_box.pack_start (contents); - own_window.set_name (get_name()); - close_event_box.set_name (get_name()); - own_window.show_all (); - hide (); - Detach (); - } - +TearOff::tearoff_click (GdkEventButton* /*ev*/) +{ + tear_it_off (); return true; } +void +TearOff::tear_it_off () +{ + if (!_can_be_torn_off) { + return; + } + + if (torn_off()) { + return; + } + + remove (contents); + window_box.pack_start (contents); + own_window.set_name (get_name()); + close_event_box.set_name (get_name()); + if (own_window_width == 0) { + own_window.set_position (WIN_POS_MOUSE); + } + own_window.show_all (); + own_window.present (); + hide (); + + _torn = true; + + Detach (); +} + gint -TearOff::close_click (GdkEventButton* ev) +TearOff::close_click (GdkEventButton* /*ev*/) +{ + put_it_back (); + return true; +} + +void +TearOff::put_it_back () { + if (!torn_off()) { + return; + } + window_box.remove (contents); pack_start (contents); reorder_child (contents, 0); own_window.hide (); show_all (); + + _torn = false; + Attach (); - return true; -} +} gint TearOff::window_button_press (GdkEventButton* ev) @@ -162,7 +210,7 @@ TearOff::window_button_press (GdkEventButton* ev) } gint -TearOff::window_button_release (GdkEventButton* ev) +TearOff::window_button_release (GdkEventButton* /*ev*/) { dragging = false; own_window.remove_modal_grab(); @@ -170,7 +218,7 @@ TearOff::window_button_release (GdkEventButton* ev) } gint -TearOff::window_delete_event (GdkEventAny* ev) +TearOff::window_delete_event (GdkEventAny* /*ev*/) { return close_click(0); } @@ -184,7 +232,7 @@ TearOff::window_motion (GdkEventMotion* ev) double x_delta; double y_delta; RefPtr win (own_window.get_window()); - + own_window.get_pointer (mx, my); if (!dragging) { @@ -202,15 +250,108 @@ TearOff::window_motion (GdkEventMotion* ev) win->get_root_origin (x, y); win->move ((gint) floor (x + x_delta), (gint) floor (y + y_delta)); - + drag_x = ev->x_root; drag_y = ev->y_root; - + return true; } bool TearOff::torn_off() const { - return own_window.is_visible(); + return _torn; +} + +void +TearOff::add_state (XMLNode& node) const +{ + node.add_property ("tornoff", (_torn ? "yes" : "no")); + + if (own_window_width > 0) { + char buf[32]; + + snprintf (buf, sizeof (buf), "%d", own_window_width); + node.add_property ("width", buf); + snprintf (buf, sizeof (buf), "%d", own_window_height); + node.add_property ("height", buf); + snprintf (buf, sizeof (buf), "%d", own_window_xpos); + node.add_property ("xpos", buf); + snprintf (buf, sizeof (buf), "%d", own_window_ypos); + node.add_property ("ypos", buf); + } } + +void +TearOff::set_state (const XMLNode& node) +{ + Glib::RefPtr win; + XMLProperty const * prop; + + if ((prop = node.property (X_("tornoff"))) == 0) { + return; + } + + if (prop->value() == "yes") { + tear_it_off (); + } else { + put_it_back (); + } + + if ((prop = node.property (X_("width"))) != 0) { + sscanf (prop->value().c_str(), "%d", &own_window_width); + } + if ((prop = node.property (X_("height"))) != 0) { + sscanf (prop->value().c_str(), "%d", &own_window_height); + } + if ((prop = node.property (X_("xpos"))) != 0) { + sscanf (prop->value().c_str(), "%d", &own_window_xpos); + } + if ((prop = node.property (X_("ypos"))) != 0) { + sscanf (prop->value().c_str(), "%d", &own_window_ypos); + } + + if (own_window.is_realized()) { + own_window.set_default_size (own_window_width, own_window_height); + own_window.move (own_window_xpos, own_window_ypos); + } + /* otherwise do it once the window is realized, see below */ +} + +void +TearOff::own_window_realized () +{ + own_window.get_window()->set_decorations (WMDecoration (DECOR_BORDER|DECOR_RESIZEH)); + + if (own_window_width > 0) { + own_window.set_default_size (own_window_width, own_window_height); + own_window.move (own_window_xpos, own_window_ypos); + } +} + +bool +TearOff::own_window_configured (GdkEventConfigure*) +{ + Glib::RefPtr win; + + win = own_window.get_window (); + + if (win) { + win->get_size (own_window_width, own_window_height); + win->get_position (own_window_xpos, own_window_ypos); + } + + return false; +} + +void +TearOff::hide_visible () +{ + if (torn_off()) { + own_window.hide (); + } + + hide (); +} + +