diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-10-10 12:09:34 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-10-10 12:09:34 +0000 |
| commit | d24c375037551aa9e0e76768b9e47d4a4819082b (patch) | |
| tree | d6f870fa5314f4f9cc7e8d6c869e411bb22ed649 /src/ui | |
| parent | Fix some canvas problems and refactorization (diff) | |
| parent | merge a fix and refactor (diff) | |
| download | inkscape-d24c375037551aa9e0e76768b9e47d4a4819082b.tar.gz inkscape-d24c375037551aa9e0e76768b9e47d4a4819082b.zip | |
Update to trunk
(bzr r15142.1.9)
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/previewholder.cpp | 4 | ||||
| -rw-r--r-- | src/ui/widget/selected-style.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ui/previewholder.cpp b/src/ui/previewholder.cpp index ef11daa3b..6fec65124 100644 --- a/src/ui/previewholder.cpp +++ b/src/ui/previewholder.cpp @@ -256,7 +256,7 @@ void PreviewHolder::on_size_allocate( Gtk::Allocation& allocation ) // g_message(" anchor:%d", _anchor); Gtk::VBox::on_size_allocate( allocation ); - if ( _insides && !_wrap && (_view != VIEW_TYPE_LIST) && (_anchor == SP_ANCHOR_NORTH || _anchor == SP_ANCHOR_SOUTH) ) { +/* if ( _insides && !_wrap && (_view != VIEW_TYPE_LIST) && (_anchor == SP_ANCHOR_NORTH || _anchor == SP_ANCHOR_SOUTH) ) { Gtk::Requisition req; Gtk::Requisition req_natural; _insides->get_preferred_size(req, req_natural); @@ -267,7 +267,7 @@ void PreviewHolder::on_size_allocate( Gtk::Allocation& allocation ) } else { dynamic_cast<Gtk::ScrolledWindow*>(_scroller)->set_policy( Gtk::POLICY_AUTOMATIC, Gtk::POLICY_NEVER ); } - } + }*/ } //void PreviewHolder::on_size_request( Gtk::Requisition* requisition ) diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index 301a3b2e0..ebc6fe919 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -1011,8 +1011,8 @@ SelectedStyle::update() _mode[i] = SS_RGRADIENT; #ifdef WITH_MESH } else if (SP_IS_MESHGRADIENT(server)) { - SPGradient *vector = SP_GRADIENT(server)->getVector(); - sp_gradient_image_set_gradient(SP_GRADIENT_IMAGE(_gradient_preview_m[i]), vector); + SPGradient *array = SP_GRADIENT(server)->getArray(); + sp_gradient_image_set_gradient(SP_GRADIENT_IMAGE(_gradient_preview_m[i]), array); place->add(_gradient_box_m[i]); place->set_tooltip_text(__mgradient[i]); _mode[i] = SS_MGRADIENT; |