Skip to content

Commit

Permalink
Fix 517-After closing an exported Canvas it can't be reopened from Ca…
Browse files Browse the repository at this point in the history
…nvas Browser

- The canvas_view was hided, but never show again. Show it on Canvasview::present
+
- Some comments around
  • Loading branch information
d-j-a-y committed Mar 14, 2014
1 parent 80afbe5 commit 38aa9d9
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 1 deletion.
2 changes: 2 additions & 0 deletions synfig-studio/src/gui/canvasview.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -958,6 +958,8 @@ void CanvasView::deactivate()
void CanvasView::present()
{
Dockable::present();
// If hided by CanvasView::close_view, time to come back to the show
if(!get_visible())show();
update_title();
}

Expand Down
4 changes: 3 additions & 1 deletion synfig-studio/src/gui/docks/dock_canvases.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,9 @@ class Dock_Canvases : public Dockable
void refresh_instances();

bool close();

//! Signal handler of signal_row_activated, look for the desired canvas, and
//! give it the focus
/*! \see studio::Instance::focus */
void on_row_activate(const Gtk::TreeModel::Path &path, Gtk::TreeViewColumn *);
//bool on_tree_event(GdkEvent *event);

Expand Down
3 changes: 3 additions & 0 deletions synfig-studio/src/gui/docks/dockbook.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,9 @@ class DockBook : public Gtk::Notebook

bool tab_button_pressed(GdkEventButton* event, Dockable* dockable);
void on_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int, int, const Gtk::SelectionData& selection_data, guint, guint time);
//! Overide the default handler of the signal Gtk::Notebook::signal_switch_page().
//! to do some extra work in case of CanvasView Dockable type
/*! \see App::set_selected_canvas_view */
void on_switch_page(GtkNotebookPage* page, guint page_num);
}; // END of studio::DockBook

Expand Down

0 comments on commit 38aa9d9

Please sign in to comment.