liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Main file catalog now scrolls to first selected image on returning from filmstrip; see issue #360

Browse Source
This commit is contained in:
Oliver Duis
2010-12-01 20:53:06 +01:00
parent a66758ceff
commit 10ebd2f7c4
3 changed files with 23 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
rtgui/rtwindow.cc
View File

@@ -61,7 +61,6 @@ RTWindow::RTWindow () {
hbf->set_spacing (2);
hbf->show_all ();
mainNB->append_page (*fpanel, *hbf);
fpanel->signal_expose_event().connect( sigc::mem_fun(*this, &RTWindow::on_expose_event_fpanel) );
bpanel = new BatchQueuePanel ();
bpanel->setParent (this);
@@ -85,8 +84,6 @@ RTWindow::RTWindow () {
hbe->show_all ();
mainNB->append_page (*epanel, *hbe);
mainNB->set_current_page (mainNB->page_num (*fpanel));
epanel->signal_expose_event().connect( sigc::mem_fun(*this, &RTWindow::on_expose_event_epanel) );
signal_key_press_event().connect( sigc::mem_fun(*this, &RTWindow::keyPressed) );
@@ -124,7 +121,6 @@ RTWindow::RTWindow () {
}
void RTWindow::on_realize () {
Gtk::Window::on_realize ();
fpanel->setAspect();
@@ -145,10 +141,16 @@ bool RTWindow::on_window_state_event(GdkEventWindowState* event) {
}
void RTWindow::on_mainNB_switch_page(GtkNotebookPage* page, guint page_num) {
bool singleTabMode = !options.tabbedUI && !EditWindow::isMultiDisplayEnabled();
if (page_num > 1) {
if (singleTabMode) MoveFileBrowserToEditor();
EditorPanel *ep = (EditorPanel *)mainNB->get_nth_page(page_num);
ep->setAspect();
}
} else {
if (singleTabMode) MoveFileBrowserToMain();
}
}
void RTWindow::addEditorPanel (EditorPanel* ep, const std::string &name) {
@@ -367,17 +369,3 @@ void RTWindow::MoveFileBrowserToEditor()
}
}
bool RTWindow::on_expose_event_epanel(GdkEventExpose* event)
{
if(!options.tabbedUI && !EditWindow::isMultiDisplayEnabled())
MoveFileBrowserToEditor();
return false; // Gtk::VBox::on_expose_event(event);
}
bool RTWindow::on_expose_event_fpanel(GdkEventExpose* event)
{
if(!options.tabbedUI && !EditWindow::isMultiDisplayEnabled())
MoveFileBrowserToMain();
return false; // Gtk::HPaned::on_expose_event(event);
}