Fixes to last commit, see #326

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 2.8.8)
 
 project(juci)
-set(JUCI_VERSION "1.2.3.2")
+set(JUCI_VERSION "1.2.3.3")
 
 set(CPACK_PACKAGE_NAME "jucipp")
 set(CPACK_PACKAGE_CONTACT "Ole Christian Eidheim <eidheim@gmail.com>")

src/files.h

@@ -155,9 +155,9 @@ R"RAW(
 R"RAW(
         "close_tab": "<primary>w",
         "window_toggle_split": "",
+        "window_toggle_full_screen": "",
         "window_toggle_tabs": "",
-        "window_clear_terminal": "",
-        "full_screen": "F11"
+        "window_clear_terminal": ""
     },
     "project": {
         "default_build_path_comment": "Use <project_directory_name> to insert the project top level directory name",

src/menu.cc

@@ -443,6 +443,12 @@ const Glib::ustring menu_xml= R"RAW(<interface>
           <attribute name='label' translatable='yes'>_Toggle _Split</attribute>
           <attribute name='action'>app.window_toggle_split</attribute>
         </item>
+      </section>
+      <section>
+        <item>
+          <attribute name='label' translatable='yes'>_Toggle _Full _Screen</attribute>
+          <attribute name='action'>app.window_toggle_full_screen</attribute>
+        </item>
         <item>
           <attribute name='label' translatable='yes'>_Toggle _Tabs _Visibility</attribute>
           <attribute name='action'>app.window_toggle_tabs</attribute>
@@ -454,12 +460,6 @@ const Glib::ustring menu_xml= R"RAW(<interface>
           <attribute name='action'>app.window_clear_terminal</attribute>
         </item>
       </section>
-      <section>
-        <item>
-          <attribute name='label' translatable='yes'>_Full _Screen</attribute>
-          <attribute name='action'>app.full_screen</attribute>
-        </item>
-      </section>
     </submenu>
   </menu>
 </interface>

src/window.cc

@@ -1181,21 +1181,18 @@ void Window::set_menu_actions() {
   menu.add_action("window_toggle_split", [this] {
     Notebook::get().toggle_split();
   });
-  menu.add_action("window_clear_terminal", [this] {
-    Terminal::get().clear();
-  });
-  menu.add_action("full_screen", [this] {
-    if(!is_full_screen){
-      Window::get().fullscreen();
-      is_full_screen = true;
-    } else {
-      Window::get().unfullscreen();
-      is_full_screen = false;
-    }
+  menu.add_action("window_toggle_full_screen", [this] {
+    if(this->get_window()->get_state() & Gdk::WindowState::WINDOW_STATE_FULLSCREEN)
+      unfullscreen();
+    else
+      fullscreen();
   });
   menu.add_action("window_toggle_tabs", [this] {
     Notebook::get().toggle_tabs();
   });
+  menu.add_action("window_clear_terminal", [this] {
+    Terminal::get().clear();
+  });
 }
 
 void Window::activate_menu_items() {

src/window.h

@@ -35,7 +35,6 @@ private:
   bool case_sensitive_search=true;
   bool regex_search=false;
   bool search_entry_shown=false;
-  bool is_full_screen=false;
 };
 
 #endif  // JUCI_WINDOW_H