Merge branch 'dev' into meow_fixes

rtgui/CMakeLists.txt

@@ -224,7 +224,8 @@ add_dependencies(rth UpdateInfo)
 add_dependencies(rth-cli UpdateInfo)
 
 # Set executables targets properties, i.e. output filename and compile flags
-if(WIN32)
+# for "Debug" builds, open a console in all cases for Windows version
+if((WIN32) AND NOT(UPPER_CMAKE_BUILD_TYPE STREQUAL "DEBUG"))
 set_target_properties(rth PROPERTIES LINK_FLAGS "-mwindows")
 endif()
 set_target_properties(rth PROPERTIES COMPILE_FLAGS "${CMAKE_CXX_FLAGS}" OUTPUT_NAME rawtherapee)

rtgui/editwindow.cc

@@ -78,7 +78,7 @@ EditWindow::EditWindow (RTWindow* p) : parent(p) , isFullscreen(false)
     set_resizable(true);
 
     property_destroy_with_parent().set_value(false);
-    signal_window_state_event().connect( sigc::mem_fun(*this, &EditWindow::on_window_state_event) );
+    //signal_window_state_event().connect( sigc::mem_fun(*this, &EditWindow::on_window_state_event) );
 
     mainNB = Gtk::manage (new Gtk::Notebook ());
     mainNB->set_scrollable (true);
@@ -100,18 +100,16 @@ void EditWindow::on_realize ()
     editWindowCursorManager.init (get_window());
 }
 
+/*  HOMBRE: Disabling this since it's maximized when opened anyway.
+ *  Someday, the EditorWindow migh save it own position and state, so it'll have to be uncommented
 bool EditWindow::on_window_state_event(GdkEventWindowState* event)
 {
-    if (!event->new_window_state) {
-        // Window mode
-        options.windowMaximized = false;
-    } else if (event->new_window_state & (GDK_WINDOW_STATE_MAXIMIZED | GDK_WINDOW_STATE_FULLSCREEN)) {
-        // Fullscreen mode
-        options.windowMaximized = true;
+    if (event->changed_mask & GDK_WINDOW_STATE_MAXIMIZED) {
+        options.windowMaximized = event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED;
     }
 
-    return true;
-}
+    return Gtk::Widget::on_window_state_event(event);
+}*/
 
 void EditWindow::on_mainNB_switch_page(Gtk::Widget* widget, guint page_num)
 {

rtgui/editwindow.h

@@ -50,7 +50,7 @@ public:
 
     bool keyPressed (GdkEventKey* event);
     bool on_delete_event(GdkEventAny* event);
-    bool on_window_state_event(GdkEventWindowState* event);
+    //bool on_window_state_event(GdkEventWindowState* event);
     void on_mainNB_switch_page(Gtk::Widget* page, guint page_num);
     void set_title_decorated(Glib::ustring fname);
 

rtgui/rtwindow.cc

@@ -131,7 +131,6 @@ RTWindow::RTWindow ()
 
     if (options.windowMaximized) {
         maximize();
-        //get_style_context()->add_class("maximized");
     } else {
         unmaximize();
         move(options.windowX, options.windowY);