diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-07-21 22:37:39 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-02-22 15:31:22 -0500 |
| commit | 8e144969199bce8008b8d5fa4449a227c207ed62 (patch) | |
| tree | cd30a94e8844e2b21233a0f77bdbc16501e8b2d9 /libs | |
| parent | e026adf4a945cc3c0d0585bedf80da9fa8d9f52a (diff) | |
use new CairoIcon to add a tab-close "button" to tabs
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/tabbable.h | 3 | ||||
| -rw-r--r-- | libs/gtkmm2ext/tabbable.cc | 11 |
2 files changed, 10 insertions, 4 deletions
diff --git a/libs/gtkmm2ext/gtkmm2ext/tabbable.h b/libs/gtkmm2ext/gtkmm2ext/tabbable.h index 51b9be397e..9d3a66adcb 100644 --- a/libs/gtkmm2ext/gtkmm2ext/tabbable.h +++ b/libs/gtkmm2ext/gtkmm2ext/tabbable.h @@ -26,6 +26,7 @@ #include <gtkmm/image.h> #include <gtkmm/label.h> +#include "gtkmm2ext/cairo_icon.h" #include "gtkmm2ext/window_proxy.h" #include "gtkmm2ext/visibility.h" @@ -79,7 +80,7 @@ class LIBGTKMM2EXT_API Tabbable : public WindowProxy { Gtk::HBox _tab_box; Gtk::Label _tab_label; Gtk::Button _tab_close_button; - Gtk::Image tab_close_image; + CairoIcon tab_close_image; void show_tab (); void tab_close_clicked (); diff --git a/libs/gtkmm2ext/tabbable.cc b/libs/gtkmm2ext/tabbable.cc index ebec13b9e9..34979d6bbe 100644 --- a/libs/gtkmm2ext/tabbable.cc +++ b/libs/gtkmm2ext/tabbable.cc @@ -24,6 +24,7 @@ #include "gtkmm2ext/tabbable.h" #include "gtkmm2ext/gtk_ui.h" +#include "gtkmm2ext/utils.h" #include "gtkmm2ext/visibility_tracker.h" #include "i18n.h" @@ -35,12 +36,16 @@ using std::string; Tabbable::Tabbable (Widget& w, const string& name) : WindowProxy (name) , _contents (w) - , tab_close_image (Stock::CLOSE, ICON_SIZE_BUTTON) + , tab_close_image (ArdourIcon::CloseCross, 0xffffffff) { + /* make the image about the same size as an actual X */ + set_size_request_to_display_given_text (tab_close_image, "X", 0, 0); + + _tab_box.set_spacing (2); _tab_box.pack_start (_tab_label, true, true); _tab_box.pack_start (_tab_close_button, false, false); _tab_close_button.add (tab_close_image); - + _tab_close_button.signal_clicked().connect (sigc::mem_fun (*this, &Tabbable::tab_close_clicked)); } @@ -70,7 +75,7 @@ Tabbable::add_to_notebook (Notebook& notebook, const string& tab_title) { _tab_label.set_text (tab_title); _tab_box.show_all (); - + notebook.append_page (_contents, _tab_box); Gtkmm2ext::UI::instance()->set_tip (_tab_label, |