Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert changes for Panel Tabs made in #2189 #2436

Merged
merged 1 commit into from Nov 22, 2021
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 6 additions & 10 deletions synfig-studio/src/gui/docks/dockable.cpp
Expand Up @@ -292,8 +292,8 @@ Dockable::present()
Gtk::Widget*
Dockable::create_tab_label()
{
Gtk::Box *box = manage(new Gtk::Box());
attach_dnd_to(*box);
Gtk::EventBox *event_box = manage(new Gtk::EventBox());
attach_dnd_to(*event_box);

// Check to make sure the icon is valid
Gtk::StockItem stock_item;
Expand All @@ -302,21 +302,17 @@ Dockable::create_tab_label()
Gtk::IconSize iconsize = Gtk::IconSize::from_name("synfig-small_icon_16x16");
Gtk::Image* icon(manage(new Gtk::Image(get_stock_id(), iconsize)));
icon->show();
box->set_tooltip_text(get_local_name());
box->add(*icon);
// add label
Gtk::Label* label = manage(new Gtk::Label(get_local_name()));
label->show();
box->add(*label);
event_box->set_tooltip_text(get_local_name());
event_box->add(*icon);

} else {
// bad icon, add label
Gtk::Label* label = manage(new Gtk::Label(get_local_name()));
label->show();
box->add(*label);
event_box->add(*label);
}

return box;
return event_box;
}

void Dockable::write_layout_string(std::string& /*params*/) const
Expand Down