diff options
| author | Jabiertxof <jabier.arraiza@marker.es> | 2019-02-19 18:32:09 +0000 |
|---|---|---|
| committer | Jabiertxof <jabier.arraiza@marker.es> | 2019-02-19 18:32:09 +0000 |
| commit | 21894e2d9fb177a5c667de146435c865edb1d5e3 (patch) | |
| tree | 80dc5d41388f04352e27c0d611de1283bf3bcf54 /src | |
| parent | Fix header. (diff) | |
| download | inkscape-21894e2d9fb177a5c667de146435c865edb1d5e3.tar.gz inkscape-21894e2d9fb177a5c667de146435c865edb1d5e3.zip | |
Fixing windows glitches
Diffstat (limited to 'src')
| -rw-r--r-- | src/ui/dialog/livepatheffect-add.cpp | 15 | ||||
| -rw-r--r-- | src/ui/dialog/livepatheffect-add.h | 1 |
2 files changed, 5 insertions, 11 deletions
diff --git a/src/ui/dialog/livepatheffect-add.cpp b/src/ui/dialog/livepatheffect-add.cpp index ce9e7464d..7ed1e6d76 100644 --- a/src/ui/dialog/livepatheffect-add.cpp +++ b/src/ui/dialog/livepatheffect-add.cpp @@ -83,7 +83,6 @@ LivePathEffectAdd::LivePathEffectAdd() : converter(Inkscape::LivePathEffect::LPETypeConverter) , _applied(false) , _showfavs(false) - , _started(true) { Glib::ustring gladefile = get_filename(Inkscape::IO::Resource::UIS, "dialog-livepatheffect-add.ui"); try { @@ -195,6 +194,11 @@ LivePathEffectAdd::LivePathEffectAdd() sigc::mem_fun(*this, &LivePathEffectAdd::mouseout), GTK_WIDGET(_LPESelectorEffectInfoEventBox->gobj()))); _LPEExperimental->property_active().signal_changed().connect( sigc::mem_fun(*this, &LivePathEffectAdd::reload_effect_list)); + Gtk::Window *window = SP_ACTIVE_DESKTOP->getToplevel(); + int width; + int height; + window->get_size(width, height); + _LPEDialogSelector->resize(std::min(width - 300, 1440), std::min(height - 300, 900)); _LPEDialogSelector->show_all_children(); } const LivePathEffect::EnumEffectData<LivePathEffect::EffectType> *LivePathEffectAdd::getActiveData() @@ -534,7 +538,6 @@ void LivePathEffectAdd::onKeyEvent(GdkEventKey *evt) void LivePathEffectAdd::show(SPDesktop *desktop) { LivePathEffectAdd &dial = instance(); - dial._LPEDialogSelector->hide(); Inkscape::Selection *sel = desktop->getSelection(); if (sel && !sel->isEmpty()) { SPItem *item = sel->singleItem(); @@ -555,14 +558,6 @@ void LivePathEffectAdd::show(SPDesktop *desktop) } } } - if (dial._started) { - dial._started = false; - Gtk::Window *window = desktop->getToplevel(); - int width; - int height; - window->get_size(width, height); - dial._LPEDialogSelector->resize(std::min(width - 300, 1440), std::min(height - 300, 900)); - } dial._applied = false; dial._LPESelectorFlowBox->unset_sort_func(); dial._LPESelectorFlowBox->unset_filter_func(); diff --git a/src/ui/dialog/livepatheffect-add.h b/src/ui/dialog/livepatheffect-add.h index 69c1da421..d1767ca3e 100644 --- a/src/ui/dialog/livepatheffect-add.h +++ b/src/ui/dialog/livepatheffect-add.h @@ -107,7 +107,6 @@ private: const LivePathEffect::EnumEffectData<LivePathEffect::EffectType> *_to_add; bool _showfavs; bool _applied; - bool _started; class Effect; const LivePathEffect::EnumEffectDataConverter<LivePathEffect::EffectType> &converter; static LivePathEffectAdd &instance() |