diff options
| author | liampwhite <byteslice@airmail.cc> | 2016-10-09 19:44:23 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2016-10-09 19:44:23 +0000 |
| commit | 21a70ba7b07c29ca0c729f7ab3ac33431c417b21 (patch) | |
| tree | 77f57323a0fa9fc0807ead774534527a36ab5b3b | |
| parent | Provide simple "preview" for mesh gradients. (diff) | |
| download | inkscape-21a70ba7b07c29ca0c729f7ab3ac33431c417b21.tar.gz inkscape-21a70ba7b07c29ca0c729f7ab3ac33431c417b21.zip | |
Fix palette flickering, probably.
Fixed bugs:
- https://launchpad.net/bugs/1201545
(bzr r15158)
| -rw-r--r-- | src/ui/previewholder.cpp | 4 | ||||
| -rw-r--r-- | src/widgets/button.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/widgets/button.cpp b/src/widgets/button.cpp index 3f4f1207a..485300a25 100644 --- a/src/widgets/button.cpp +++ b/src/widgets/button.cpp @@ -41,8 +41,8 @@ static void sp_button_class_init(SPButtonClass *klass) GtkButtonClass *button_class = GTK_BUTTON_CLASS(klass); object_class->dispose = sp_button_dispose; - widget_class->get_preferred_width = sp_button_get_preferred_width; - widget_class->get_preferred_height = sp_button_get_preferred_height; + //widget_class->get_preferred_width = sp_button_get_preferred_width; + //widget_class->get_preferred_height = sp_button_get_preferred_height; button_class->clicked = sp_button_clicked; } |