summaryrefslogtreecommitdiffstats
path: root/src/ui/dialog/panel-dialog.h
diff options
context:
space:
mode:
authorgustav_b <gustav_b@users.sourceforge.net>2008-02-17 16:27:23 +0000
committergustav_b <gustav_b@users.sourceforge.net>2008-02-17 16:27:23 +0000
commit1f59e3e2769db3d15db9fd2bafb3eb660c1fa27a (patch)
treea456815c724d29599843aa563527ae3362ca9d73 /src/ui/dialog/panel-dialog.h
parentadd myself to the Translator list (diff)
downloadinkscape-1f59e3e2769db3d15db9fd2bafb3eb660c1fa27a.tar.gz
inkscape-1f59e3e2769db3d15db9fd2bafb3eb660c1fa27a.zip
Fix #192549 "selected style indicator can only call fill&stroke dialog once",
regression by r17207. (Request dialog to presented when panel signals present.) (bzr r4754)
Diffstat (limited to '')
-rw-r--r--src/ui/dialog/panel-dialog.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/src/ui/dialog/panel-dialog.h b/src/ui/dialog/panel-dialog.h
index 6a2218a06..eebd323d6 100644
--- a/src/ui/dialog/panel-dialog.h
+++ b/src/ui/dialog/panel-dialog.h
@@ -74,6 +74,8 @@ public:
inline virtual void present();
private:
+ inline void _presentDialog();
+
PanelDialog(); // no constructor without params
PanelDialog(PanelDialog<Behavior> const &d); // no copy
PanelDialog<Behavior>& operator=(PanelDialog<Behavior> const &d); // no assign
@@ -134,6 +136,7 @@ PanelDialog<B>::PanelDialog(Panel &panel, char const *prefs_path, int const verb
{
Gtk::VBox *vbox = get_vbox();
_panel.signalResponse().connect(sigc::mem_fun(*this, &PanelDialog::_handleResponse));
+ _panel.signalPresent().connect(sigc::mem_fun(*this, &PanelDialog::_presentDialog));
vbox->pack_start(_panel, true, true, 0);
@@ -168,10 +171,16 @@ template <typename B>
void
PanelDialog<B>::present()
{
- Dialog::present();
_panel.present();
}
+template <typename B>
+void
+PanelDialog<B>::_presentDialog()
+{
+ Dialog::present();
+}
+
PanelDialog<Behavior::FloatingBehavior>::PanelDialog(Panel &panel, char const *prefs_path,
int const verb_num, Glib::ustring const &apply_label) :
PanelDialogBase(panel, prefs_path, verb_num, apply_label),