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

States of tools are lost when closing rt without opening an image in SETM, Issue 2779

Browse Source
This commit is contained in:
Ingo
2015-05-18 21:45:34 +02:00
parent e407f6e79a
commit a06c7c536a
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/editorpanel.cc
View File

@@ -32,7 +32,7 @@
using namespace rtengine::procparams; using namespace rtengine::procparams;
EditorPanel::EditorPanel (FilePanel* filePanel) EditorPanel::EditorPanel (FilePanel* filePanel)
: beforePreviewHandler(NULL), beforeIarea(NULL), beforeBox(NULL), afterBox(NULL), afterHeaderBox(NULL), parent(NULL), ipc(NULL), beforeIpc(NULL), isProcessing(false), catalogPane(NULL), iHistoryShow(NULL), iHistoryHide(NULL), iBeforeLockON(NULL),iBeforeLockOFF(NULL), iRightPanel_1_Show(NULL), iRightPanel_1_Hide(NULL), iTopPanel_1_Show(NULL), iTopPanel_1_Hide(NULL), openThm(NULL) { : beforePreviewHandler(NULL), beforeIarea(NULL), beforeBox(NULL), afterBox(NULL), afterHeaderBox(NULL), parent(NULL), ipc(NULL), beforeIpc(NULL), isProcessing(false), catalogPane(NULL), iHistoryShow(NULL), iHistoryHide(NULL), iBeforeLockON(NULL),iBeforeLockOFF(NULL), iRightPanel_1_Show(NULL), iRightPanel_1_Hide(NULL), iTopPanel_1_Show(NULL), iTopPanel_1_Hide(NULL), openThm(NULL), realized(false) {
epih = new EditorPanelIdleHelper; epih = new EditorPanelIdleHelper;
epih->epanel = this; epih->epanel = this;
@@ -435,8 +435,8 @@ void EditorPanel::setAspect () {
info->set_active (options.showInfo); info->set_active (options.showInfo);
} }
void EditorPanel::on_realize () { void EditorPanel::on_realize () {
realized = true;
Gtk::VBox::on_realize (); Gtk::VBox::on_realize ();
// This line is needed to avoid autoexpansion of the window :-/ // This line is needed to avoid autoexpansion of the window :-/
vboxright->set_size_request (options.toolPanelWidth, -1); vboxright->set_size_request (options.toolPanelWidth, -1);

4
rtgui/editorpanel.h
View File

@@ -52,6 +52,7 @@ class EditorPanel : public Gtk::VBox,
private: private:
Glib::ustring lastSaveAsFileName; Glib::ustring lastSaveAsFileName;
bool realized;
protected: protected:
Gtk::ProgressBar *progressLabel; Gtk::ProgressBar *progressLabel;
@@ -134,7 +135,6 @@ class EditorPanel : public Gtk::VBox,
public: public:
EditorPanel (FilePanel* filePanel = NULL); EditorPanel (FilePanel* filePanel = NULL);
virtual ~EditorPanel (); virtual ~EditorPanel ();
@@ -148,7 +148,7 @@ class EditorPanel : public Gtk::VBox,
void writeOptions(); void writeOptions();
void showTopPanel(bool show); void showTopPanel(bool show);
bool isRealized() { return realized; }
// progresslistener interface // progresslistener interface
void setProgress (double p); void setProgress (double p);
void setProgressStr (Glib::ustring str); void setProgressStr (Glib::ustring str);

2
rtgui/rtwindow.cc
View File

@@ -589,7 +589,7 @@ bool RTWindow::on_delete_event(GdkEventAny* event) {
if( bpanel ) if( bpanel )
bpanel->saveOptions (); bpanel->saveOptions ();
if (isSingleTabMode() || simpleEditor) { if ((isSingleTabMode() || simpleEditor) && epanel->isRealized()) {
epanel->saveProfile(); epanel->saveProfile();
epanel->writeOptions (); epanel->writeOptions ();
} }