summaryrefslogtreecommitdiffstats
path: root/src/ui/widget
diff options
context:
space:
mode:
Diffstat (limited to 'src/ui/widget')
-rw-r--r--src/ui/widget/dock-item.cpp68
-rw-r--r--src/ui/widget/dock.cpp84
2 files changed, 79 insertions, 73 deletions
diff --git a/src/ui/widget/dock-item.cpp b/src/ui/widget/dock-item.cpp
index 74cc44be9..f3fba93bf 100644
--- a/src/ui/widget/dock-item.cpp
+++ b/src/ui/widget/dock-item.cpp
@@ -48,7 +48,7 @@ DockItem::DockItem(Dock& dock, const Glib::ustring& name, const Glib::ustring& l
}
- GdlDockItemBehavior gdl_dock_behavior =
+ GdlDockItemBehavior gdl_dock_behavior =
(prefs_get_int_attribute_limited ("options.dock", "cancenterdock", 1, 0, 1) == 0 ?
GDL_DOCK_ITEM_BEH_CANT_DOCK_CENTER
: GDL_DOCK_ITEM_BEH_NORMAL);
@@ -56,8 +56,8 @@ DockItem::DockItem(Dock& dock, const Glib::ustring& name, const Glib::ustring& l
if (!icon_name.empty()) {
Gtk::Widget *icon = sp_icon_get_icon(icon_name, Inkscape::ICON_SIZE_MENU);
if (icon) {
- // check icon type (inkscape, gtk, none)
- if ( SP_IS_ICON(icon->gobj()) ) {
+ // check icon type (inkscape, gtk, none)
+ if ( SP_IS_ICON(icon->gobj()) ) {
SPIcon* sp_icon = SP_ICON(icon->gobj());
sp_icon_fetch_pixbuf(sp_icon);
_icon_pixbuf = Glib::wrap(sp_icon->pb, true);
@@ -67,12 +67,12 @@ DockItem::DockItem(Dock& dock, const Glib::ustring& name, const Glib::ustring& l
}
delete icon;
- _gdl_dock_item =
- gdl_dock_item_new_with_pixbuf_icon(name.c_str(), long_name.c_str(),
+ _gdl_dock_item =
+ gdl_dock_item_new_with_pixbuf_icon(name.c_str(), long_name.c_str(),
_icon_pixbuf->gobj(), gdl_dock_behavior);
}
} else {
- _gdl_dock_item =
+ _gdl_dock_item =
gdl_dock_item_new(name.c_str(), long_name.c_str(), gdl_dock_behavior);
}
@@ -118,9 +118,9 @@ DockItem::get_vbox()
}
-void
+void
DockItem::get_position(int& x, int& y)
-{
+{
if (getWindow()) {
getWindow()->get_position(x, y);
} else {
@@ -129,9 +129,9 @@ DockItem::get_position(int& x, int& y)
}
}
-void
+void
DockItem::get_size(int& width, int& height)
-{
+{
if (_window) {
_window->get_size(width, height);
} else {
@@ -142,7 +142,7 @@ DockItem::get_size(int& width, int& height)
void
-DockItem::resize(int width, int height)
+DockItem::resize(int width, int height)
{
if (_window)
_window->resize(width, height);
@@ -169,9 +169,9 @@ DockItem::set_size_request(int width, int height)
getWidget().set_size_request(width, height);
}
-void
+void
DockItem::size_request(Gtk::Requisition& requisition)
-{
+{
getWidget().size_request(requisition);
}
@@ -196,7 +196,7 @@ DockItem::isAttached() const
bool
DockItem::isFloating() const
{
- return (GTK_WIDGET(gdl_dock_object_get_toplevel(GDL_DOCK_OBJECT (_gdl_dock_item))) !=
+ return (GTK_WIDGET(gdl_dock_object_get_toplevel(GDL_DOCK_OBJECT (_gdl_dock_item))) !=
_dock.getGdlWidget());
}
@@ -230,7 +230,7 @@ DockItem::getPlacement() const
void
-DockItem::addButton(Gtk::Button* button, int response_id)
+DockItem::addButton(Gtk::Button* button, int /*response_id*/)
{
// Create a button box for the response buttons if it's the first button to be added
if (!_dock_item_action_area) {
@@ -266,7 +266,7 @@ DockItem::present()
if (isIconified() || !isAttached()) {
show();
- }
+ }
// tabbed
else if (getPlacement() == CENTER) {
@@ -274,7 +274,7 @@ DockItem::present()
GTK_WIDGET (_gdl_dock_item));
if (i >= 0)
gtk_notebook_set_current_page (GTK_NOTEBOOK (_gdl_dock_item->parent), i);
- }
+ }
// always grab focus, even if we're already present
grab_focus();
@@ -307,15 +307,15 @@ DockItem::grab_focus()
Glib::SignalProxy0<void>
DockItem::signal_show()
-{
- return Glib::SignalProxy0<void>(Glib::wrap(GTK_WIDGET(_gdl_dock_item)),
+{
+ return Glib::SignalProxy0<void>(Glib::wrap(GTK_WIDGET(_gdl_dock_item)),
&_signal_show_proxy);
}
Glib::SignalProxy0<void>
DockItem::signal_hide()
-{
- return Glib::SignalProxy0<void>(Glib::wrap(GTK_WIDGET(_gdl_dock_item)),
+{
+ return Glib::SignalProxy0<void>(Glib::wrap(GTK_WIDGET(_gdl_dock_item)),
&_signal_hide_proxy);
}
@@ -329,7 +329,7 @@ DockItem::signal_delete_event()
Glib::SignalProxy1<void, int>
DockItem::signal_response()
{
- return Glib::SignalProxy1<void, int>(Glib::wrap(GTK_WIDGET(_gdl_dock_item)),
+ return Glib::SignalProxy1<void, int>(Glib::wrap(GTK_WIDGET(_gdl_dock_item)),
&_signal_response_proxy);
}
@@ -421,20 +421,20 @@ DockItem::_onKeyPress(GdkEventKey *event)
}
void
-DockItem::_onStateChanged(State prev_state, State new_state)
+DockItem::_onStateChanged(State /*prev_state*/, State new_state)
{
_window = getWindow();
if (new_state == FLOATING_STATE && _window) {
_window->signal_hide().connect(sigc::mem_fun(*this, &Inkscape::UI::Widget::DockItem::_onHideWindow));
- _signal_key_press_event_connection =
+ _signal_key_press_event_connection =
_window->signal_key_press_event().connect(sigc::mem_fun(*this, &Inkscape::UI::Widget::DockItem::_onKeyPress));
}
}
bool
-DockItem::_onDeleteEvent(GdkEventAny *event)
+DockItem::_onDeleteEvent(GdkEventAny */*event*/)
{
hide();
return false;
@@ -451,7 +451,7 @@ DockItem::getWindow()
}
const Glib::SignalProxyInfo
-DockItem::_signal_show_proxy =
+DockItem::_signal_show_proxy =
{
"show",
(GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -459,7 +459,7 @@ DockItem::_signal_show_proxy =
};
const Glib::SignalProxyInfo
-DockItem::_signal_hide_proxy =
+DockItem::_signal_hide_proxy =
{
"hide",
(GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -468,7 +468,7 @@ DockItem::_signal_hide_proxy =
const Glib::SignalProxyInfo
-DockItem::_signal_delete_event_proxy =
+DockItem::_signal_delete_event_proxy =
{
"delete_event",
(GCallback) &_signal_delete_event_callback,
@@ -477,7 +477,7 @@ DockItem::_signal_delete_event_proxy =
const Glib::SignalProxyInfo
-DockItem::_signal_response_proxy =
+DockItem::_signal_response_proxy =
{
"signal_response",
(GCallback) &_signal_response_callback,
@@ -485,7 +485,7 @@ DockItem::_signal_response_proxy =
};
const Glib::SignalProxyInfo
-DockItem::_signal_drag_begin_proxy =
+DockItem::_signal_drag_begin_proxy =
{
"dock-drag-begin",
(GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -494,7 +494,7 @@ DockItem::_signal_drag_begin_proxy =
const Glib::SignalProxyInfo
-DockItem::_signal_drag_end_proxy =
+DockItem::_signal_drag_end_proxy =
{
"dock_drag_end",
(GCallback) &_signal_drag_end_callback,
@@ -503,7 +503,7 @@ DockItem::_signal_drag_end_proxy =
const Glib::SignalProxyInfo
-DockItem::_signal_realize_proxy =
+DockItem::_signal_realize_proxy =
{
"realize",
(GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -530,7 +530,7 @@ DockItem::_signal_delete_event_callback(GtkWidget *self, GdkEventAny *event, voi
return RType();
}
-void
+void
DockItem::_signal_response_callback(GtkWidget *self, gint response_id, void *data)
{
using namespace Gtk;
@@ -546,7 +546,7 @@ DockItem::_signal_response_callback(GtkWidget *self, gint response_id, void *dat
}
}
-void
+void
DockItem::_signal_drag_end_callback(GtkWidget *self, gboolean cancelled, void *data)
{
using namespace Gtk;
diff --git a/src/ui/widget/dock.cpp b/src/ui/widget/dock.cpp
index 1ca2580ba..563ed8e98 100644
--- a/src/ui/widget/dock.cpp
+++ b/src/ui/widget/dock.cpp
@@ -23,7 +23,7 @@ namespace Widget {
namespace {
-void hideCallback(GtkObject *object, gpointer dock_ptr)
+void hideCallback(GtkObject */*object*/, gpointer dock_ptr)
{
g_return_if_fail( dock_ptr != NULL );
@@ -31,7 +31,7 @@ void hideCallback(GtkObject *object, gpointer dock_ptr)
dock->hide();
}
-void unhideCallback(GtkObject *object, gpointer dock_ptr)
+void unhideCallback(GtkObject */*object*/, gpointer dock_ptr)
{
g_return_if_fail( dock_ptr != NULL );
@@ -74,8 +74,8 @@ Dock::Dock(Gtk::Orientation orientation)
_scrolled_window->set_size_request(0);
- GdlSwitcherStyle gdl_switcher_style =
- static_cast<GdlSwitcherStyle>(prefs_get_int_attribute_limited("options.dock", "switcherstyle",
+ GdlSwitcherStyle gdl_switcher_style =
+ static_cast<GdlSwitcherStyle>(prefs_get_int_attribute_limited("options.dock", "switcherstyle",
GDL_SWITCHER_STYLE_BOTH, 0, 4));
g_object_set (GDL_DOCK_OBJECT(_gdl_dock)->master,
@@ -83,8 +83,8 @@ Dock::Dock(Gtk::Orientation orientation)
"expand-direction", GDL_DOCK_EXPANSION_DIRECTION_DOWN,
NULL);
- GdlDockBarStyle gdl_dock_bar_style =
- static_cast<GdlDockBarStyle>(prefs_get_int_attribute_limited("options.dock", "dockbarstyle",
+ GdlDockBarStyle gdl_dock_bar_style =
+ static_cast<GdlDockBarStyle>(prefs_get_int_attribute_limited("options.dock", "dockbarstyle",
GDL_DOCK_BAR_BOTH, 0, 3));
gdl_dock_bar_set_style(_gdl_dock_bar, gdl_dock_bar_style);
@@ -96,7 +96,7 @@ Dock::Dock(Gtk::Orientation orientation)
g_signal_connect(_paned->gobj(), "button-release-event", G_CALLBACK(_on_paned_button_event), (void *)this);
signal_layout_changed().connect(sigc::mem_fun(*this, &Inkscape::UI::Widget::Dock::_onLayoutChanged));
-}
+}
Dock::~Dock()
{
@@ -112,8 +112,9 @@ Dock::addItem(DockItem& item, DockItem::Placement placement)
// FIXME: This is a hack to prevent the dock from expanding the main window, this can't be done
// initially as the paned doesn't exist.
- if (Gtk::Paned *paned = getParentPaned())
- paned->set_resize_mode(Gtk::RESIZE_QUEUE);
+ if (Gtk::Paned *paned = getParentPaned()) {
+ paned->set_resize_mode(Gtk::RESIZE_QUEUE);
+ }
}
Gtk::Widget&
@@ -147,12 +148,14 @@ bool
Dock::isEmpty() const
{
std::list<const DockItem *>::const_iterator
- i = _dock_items.begin(),
- e = _dock_items.end();
+ i = _dock_items.begin(),
+ e = _dock_items.end();
- for (; i != e; ++i)
- if ((*i)->getState() == DockItem::DOCKED_STATE)
- return false;
+ for (; i != e; ++i) {
+ if ((*i)->getState() == DockItem::DOCKED_STATE) {
+ return false;
+ }
+ }
return true;
}
@@ -161,13 +164,15 @@ bool
Dock::hasIconifiedItems() const
{
std::list<const DockItem *>::const_iterator
- i = _dock_items.begin(),
- e = _dock_items.end();
+ i = _dock_items.begin(),
+ e = _dock_items.end();
+
+ for (; i != e; ++i) {
+ if ((*i)->isIconified()) {
+ return true;
+ }
+ }
- for (; i != e; ++i)
- if ((*i)->isIconified())
- return true;
-
return false;
}
@@ -177,7 +182,7 @@ Dock::hide()
getWidget().hide();
}
-void
+void
Dock::show()
{
getWidget().show();
@@ -191,18 +196,18 @@ Dock::toggleDockable(int width, int height)
Gtk::Paned *parent_paned = getParentPaned();
if (width > 0 && height > 0) {
- prev_horizontal_position = parent_paned->get_position();
- prev_vertical_position = _paned->get_position();
+ prev_horizontal_position = parent_paned->get_position();
+ prev_vertical_position = _paned->get_position();
+
+ if (getWidget().get_width() < width)
+ parent_paned->set_position(parent_paned->get_width() - width);
- if (getWidget().get_width() < width)
- parent_paned->set_position(parent_paned->get_width() - width);
-
- if (_paned->get_position() < height)
- _paned->set_position(height);
+ if (_paned->get_position() < height)
+ _paned->set_position(height);
} else {
- parent_paned->set_position(prev_horizontal_position);
- _paned->set_position(prev_vertical_position);
+ parent_paned->set_position(prev_horizontal_position);
+ _paned->set_position(prev_vertical_position);
}
}
@@ -226,7 +231,7 @@ Dock::scrollToItem(DockItem& item)
Glib::SignalProxy0<void>
Dock::signal_layout_changed()
{
- return Glib::SignalProxy0<void>(Glib::wrap(GTK_WIDGET(_gdl_dock)),
+ return Glib::SignalProxy0<void>(Glib::wrap(GTK_WIDGET(_gdl_dock)),
&_signal_layout_changed_proxy);
}
@@ -234,16 +239,17 @@ void
Dock::_onLayoutChanged()
{
if (isEmpty()) {
- if (hasIconifiedItems())
- _scrolled_window->set_size_request(_default_dock_bar_width);
- else
- _scrolled_window->set_size_request(_default_empty_width);
+ if (hasIconifiedItems()) {
+ _scrolled_window->set_size_request(_default_dock_bar_width);
+ } else {
+ _scrolled_window->set_size_request(_default_empty_width);
+ }
getParentPaned()->set_position(INT_MAX);
} else {
// unset any forced size requests
_paned->get_child1()->set_size_request(-1, -1);
- _scrolled_window->set_size_request(-1);
+ _scrolled_window->set_size_request(-1);
}
}
@@ -256,7 +262,7 @@ Dock::_onPanedButtonEvent(GdkEventButton *event)
}
gboolean
-Dock::_on_paned_button_event(GtkWidget *widget, GdkEventButton *event, gpointer user_data)
+Dock::_on_paned_button_event(GtkWidget */*widget*/, GdkEventButton *event, gpointer user_data)
{
if (Dock *dock = static_cast<Dock *>(user_data))
dock->_onPanedButtonEvent(event);
@@ -265,7 +271,7 @@ Dock::_on_paned_button_event(GtkWidget *widget, GdkEventButton *event, gpointer
}
const Glib::SignalProxyInfo
-Dock::_signal_layout_changed_proxy =
+Dock::_signal_layout_changed_proxy =
{
"layout-changed",
(GCallback) &Glib::SignalProxyNormal::slot0_void_callback,
@@ -287,4 +293,4 @@ Dock::_signal_layout_changed_proxy =
fill-column:99
End:
*/
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-30 02:22:45 +0000