Merge lp:~tintou/granite/granite-headerbar into lp:~elementary-pantheon/granite/granite

[David Gomes]

[Danielle Foré (danrabbit)]

After some discussion, I think we need to first decide if we intend to ship with gtk 3.12 or backport any features of gtk 3.12 (like max and min buttons) which would make this branch obsolete.

IMO, the latest improvements to headerbar would be worth it.

Unmerged revisions

665. By Corentin Noël on 2013-12-21

Added valadoc

664. By Corentin Noël on 2013-12-21

Do not reparent widgets if they are already on the right container, check if the window is resizeable to show the maximize button

663. By Corentin Noël on 2013-12-20

Now fully working

662. By Corentin Noël on 2013-12-19

New HeaderBar widget

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-11-15 15:01:20 +0000
+++ CMakeLists.txt	2013-12-22 03:34:36 +0000
@@ -9,7 +9,7 @@
 set (API_VERSION 1.0)
 
 # Used to create GObject introspection files
-set (PKG_GIR_NAME Granite)
+set (PKG_GIR_NAME Granite-${PKG_VERSION})
 
 list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/)
 

=== added file 'cmake/FindGirCompiler.cmake'
--- cmake/FindGirCompiler.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindGirCompiler.cmake	2013-12-22 03:34:36 +0000
@@ -0,0 +1,56 @@
+##
+# Copyright 2009-2010 Jakob Westhoff. All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+#    1. Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimer.
+# 
+#    2. Redistributions in binary form must reproduce the above copyright notice,
+#       this list of conditions and the following disclaimer in the documentation
+#       and/or other materials provided with the distribution.
+# 
+# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 
+# The views and conclusions contained in the software and documentation are those
+# of the authors and should not be interpreted as representing official policies,
+# either expressed or implied, of Jakob Westhoff
+##
+
+##
+# Find module for the Gir compiler (g-ir-compiler)
+#
+# This module determines wheter a Gir compiler is installed on the current
+# system and where its executable is.
+#
+# Call the module using "find_package(GirCompiler) from within your CMakeLists.txt.
+#
+# The following variables will be set after an invocation:
+#
+#  G_IR_COMPILER_FOUND       Whether the g-ir-compiler compiler has been found or not
+#  G_IR_COMPILER_EXECUTABLE  Full path to the g-ir-compiler executable if it has been found
+##
+
+
+# Search for the g-ir-compiler executable in the usual system paths.
+find_program (G_IR_COMPILER_EXECUTABLE
+  NAMES g-ir-compiler)
+
+# Handle the QUIETLY and REQUIRED arguments, which may be given to the find call.
+# Furthermore set G_IR_COMPILER_FOUND to TRUE if the g-ir-compiler has been found (aka.
+# G_IR_COMPILER_EXECUTABLE is set)
+
+include (FindPackageHandleStandardArgs)
+find_package_handle_standard_args (GirCompiler DEFAULT_MSG G_IR_COMPILER_EXECUTABLE)
+
+mark_as_advanced (G_IR_COMPILER_EXECUTABLE)

=== added file 'cmake/Tests.cmake'
--- cmake/Tests.cmake	1970-01-01 00:00:00 +0000
+++ cmake/Tests.cmake	2013-12-22 03:34:36 +0000
@@ -0,0 +1,5 @@
+# Test macros for Marlin, feel free to re-use them.
+
+macro(add_test_executable EXE_NAME)
+    add_test(${EXE_NAME} gtester ${CMAKE_CURRENT_BINARY_DIR}/${EXE_NAME})
+endmacro()

=== modified file 'cmake/Translations.cmake' (properties changed: -x to +x)
--- cmake/Translations.cmake	2012-06-05 05:05:44 +0000
+++ cmake/Translations.cmake	2013-12-22 03:34:36 +0000
@@ -36,6 +36,7 @@
 
     add_custom_command (TARGET pot COMMAND
         ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
-        ${VALA_SOURCE} ${C_SOURCE} --keyword="_" --keyword="N_" --from-code=UTF-8
+        ${VALA_SOURCE} ${C_SOURCE} --add-comments="/" --keyword="_" --keyword="N_" --keyword="C_:1c,2"
+        --keyword="NC_:1c,2" --keyword="ngettext:1,2" --keyword="N_" --keyword="Q_:1g" --from-code=UTF-8
         )
 endmacro()

=== modified file 'cmake/ValaPrecompile.cmake'
--- cmake/ValaPrecompile.cmake	2012-11-28 02:35:13 +0000
+++ cmake/ValaPrecompile.cmake	2013-12-22 03:34:36 +0000
@@ -1,5 +1,6 @@
 ##
 # Copyright 2009-2010 Jakob Westhoff. All rights reserved.
+# Copyright 2012 elementary.
 # 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -130,20 +131,37 @@
     set(out_files "")
     set(out_files_display "")
     set(${output} "")
+
     foreach(src ${ARGS_DEFAULT_ARGS})
-        list(APPEND in_files "${CMAKE_CURRENT_SOURCE_DIR}/${src}")
+        string(REGEX MATCH "^/" IS_MATCHED ${src})
+        if(${IS_MATCHED} MATCHES "/")
+            set(src_file_path ${src})
+        else()
+            set(src_file_path ${CMAKE_CURRENT_SOURCE_DIR}/${src})
+        endif()
+        list(APPEND in_files ${src_file_path})
         string(REPLACE ".vala" ".c" src ${src})
         string(REPLACE ".gs" ".c" src ${src})
-        set(out_file "${DIRECTORY}/${src}")
-        list(APPEND out_files "${DIRECTORY}/${src}")
+        if(${IS_MATCHED} MATCHES "/")
+            get_filename_component(VALA_FILE_NAME ${src} NAME)
+            set(out_file "${CMAKE_CURRENT_BINARY_DIR}/${VALA_FILE_NAME}")
+            list(APPEND out_files "${CMAKE_CURRENT_BINARY_DIR}/${VALA_FILE_NAME}")
+        else()
+            set(out_file "${DIRECTORY}/${src}")
+            list(APPEND out_files "${DIRECTORY}/${src}")
+        endif()
+        list(APPEND ${output} ${out_file})
         list(APPEND out_files_display "${src}")
-        list(APPEND ${output} ${out_file})
     endforeach(src ${ARGS_DEFAULT_ARGS})
 
     set(custom_vapi_arguments "")
     if(ARGS_CUSTOM_VAPIS)
         foreach(vapi ${ARGS_CUSTOM_VAPIS})
-            list(APPEND custom_vapi_arguments ${vapi})
+            if(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
+                list(APPEND custom_vapi_arguments ${vapi})
+            else (${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
+                list(APPEND custom_vapi_arguments ${CMAKE_CURRENT_SOURCE_DIR}/${vapi})
+            endif(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
         endforeach(vapi ${ARGS_CUSTOM_VAPIS})
     endif(ARGS_CUSTOM_VAPIS)
 
@@ -152,6 +170,11 @@
         list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_VAPI}.vapi")
         list(APPEND out_files_display "${ARGS_GENERATE_VAPI}.vapi")
         set(vapi_arguments "--library=${ARGS_GENERATE_VAPI}" "--vapi=${ARGS_GENERATE_VAPI}.vapi")
+
+        # Header and internal header is needed to generate internal vapi
+        if (NOT ARGS_GENERATE_HEADER)
+            set(ARGS_GENERATE_HEADER ${ARGS_GENERATE_VAPI})
+        endif(NOT ARGS_GENERATE_HEADER)
     endif(ARGS_GENERATE_VAPI)
 
     set(header_arguments "")
@@ -162,10 +185,21 @@
     endif(ARGS_GENERATE_HEADER)
 
     set(gir_arguments "")
+    set(gircomp_command "")
     if(ARGS_GENERATE_GIR)
         list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_GIR}.gir")
         list(APPEND out_files_display "${ARGS_GENERATE_GIR}.gir")
         set(gir_arguments "--gir=${ARGS_GENERATE_GIR}.gir")
+
+        include (FindGirCompiler)
+        find_package(GirCompiler REQUIRED)
+        
+        set(gircomp_command 
+            COMMAND 
+                ${G_IR_COMPILER_EXECUTABLE}
+            ARGS 
+                "${DIRECTORY}/${ARGS_GENERATE_GIR}.gir"
+                -o "${DIRECTORY}/${ARGS_GENERATE_GIR}.typelib")
     endif(ARGS_GENERATE_GIR)
 
     set(symbols_arguments "")
@@ -178,7 +212,7 @@
     # Workaround for a bug that would make valac run twice. This file is written
     # after the vala compiler generates C source code.
     set(OUTPUT_STAMP ${CMAKE_CURRENT_BINARY_DIR}/${target_name}_valac.stamp)
-
+        
     add_custom_command(
     OUTPUT
         ${OUTPUT_STAMP}
@@ -205,6 +239,7 @@
         ${ARGS_CUSTOM_VAPIS}
     COMMENT
         "Generating ${out_files_display}"
+    ${gircomp_command}
     )
 
     # This command will be run twice for some reason (pass a non-empty string to COMMENT

=== modified file 'demo/GraniteDemo.vala'
--- demo/GraniteDemo.vala	2013-12-15 12:41:49 +0000
+++ demo/GraniteDemo.vala	2013-12-22 03:34:36 +0000
@@ -84,6 +84,7 @@
     private Gtk.Grid main_layout; // outer-most container
     private Granite.Widgets.ModeButton mode_button;
     private int dark_mode_index;
+    private bool fullscreen = false;
 
     /**
      * Basic app information for Granite.Application. This is used by the About dialog.
@@ -125,10 +126,8 @@
 
         this.add_window (window);
 
-        var main_toolbar = new Gtk.Toolbar ();
-        main_toolbar.get_style_context ().add_class (Gtk.STYLE_CLASS_PRIMARY_TOOLBAR);
-        main_toolbar.hexpand = true;
-        main_toolbar.vexpand = false;
+        var main_toolbar = new Granite.Widgets.HeaderBar (window);
+        main_toolbar.set_title ("Demo");
 
         // SourceList
         var sidebar = new Granite.Widgets.SourceList ();
@@ -169,7 +168,7 @@
         main_layout = new Gtk.Grid ();
         main_layout.expand = true;
         main_layout.orientation = Gtk.Orientation.VERTICAL;
-        main_layout.add (main_toolbar);
+        main_layout.add (main_toolbar.get_revealer ());
         main_layout.add (sidebar_paned);
         main_layout.add (statusbar);
 
@@ -185,14 +184,12 @@
         sidebar.selected = welcome_item;
 
         // Light window
-        var light_window_icon = new Gtk.Image.from_icon_name ("document-new", Gtk.IconSize.LARGE_TOOLBAR);
-        var light_window_item = new Gtk.ToolButton (light_window_icon, "Show LightWindow");
-        light_window_item.icon_name = "document-new";
+        var light_window_item = new Gtk.Button.from_icon_name ("document-new", Gtk.IconSize.LARGE_TOOLBAR);
         light_window_item.tooltip_text = "Show Light Window";
         light_window_item.halign = light_window_item.valign = Gtk.Align.CENTER;
         light_window_item.clicked.connect (show_light_window);
 
-        main_toolbar.insert (light_window_item, -1);
+        main_toolbar.pack_start (light_window_item);
 
         // StaticNotebook
         var staticnotebook = new Granite.Widgets.StaticNotebook ();
@@ -224,11 +221,7 @@
 
         mode_button.mode_changed.connect (on_theme_mode_button_changed);
 
-        var mode_button_item = new Gtk.ToolItem ();
-        mode_button_item.add (mode_button);
-        main_toolbar.insert (mode_button_item, -1);
-
-        mode_button_item.halign = mode_button_item.valign = Gtk.Align.CENTER;
+        main_toolbar.pack_start (mode_button);
 
         // PopOvers
         var popover_statusbar_item = new Gtk.Button ();
@@ -263,19 +256,14 @@
         });
 
         // Date widget
-        var calendar_tool_item = new Gtk.ToolItem ();
-        calendar_tool_item.margin_left = 12;
         var date_button = new Granite.Widgets.DatePicker.with_format ("%d-%m-%y");
-        calendar_tool_item.add (date_button);
-        main_toolbar.insert (calendar_tool_item, -1);
+        date_button.margin_left = 12;
+        main_toolbar.pack_start (date_button);
 
         // Time widget
-        var time_tool_item = new Gtk.ToolItem ();
-        time_tool_item.margin_left = 12;
-        time_tool_item.valign = Gtk.Align.CENTER;
         var time_button = new Granite.Widgets.TimePicker ();
-        time_tool_item.add (time_button);
-        main_toolbar.insert (time_tool_item, -1);
+        time_button.margin_left = 12;
+        main_toolbar.pack_start (time_button);
 
         // Dynamic notebook
         var dynamic_notebook = create_dynamic_notebook ();
@@ -283,22 +271,29 @@
         widgets_category.add (dynamic_notebook_item);
         dynamic_notebook_item.page_num = page_switcher.append_page (dynamic_notebook, null);
 
-        var right_sep = new Gtk.SeparatorToolItem ();
-        right_sep.draw = false;
-        right_sep.set_expand (true);
-        main_toolbar.insert (right_sep, -1);
-
         // Search Entry
         var search_entry = new Granite.Widgets.SearchBar ("Search");
-        var search_item = new Gtk.ToolItem ();
-        search_item.add (search_entry);
-        search_item.margin_left = 12;
-        main_toolbar.insert (search_item, -1);
+        search_entry.margin_left = 12;
+        main_toolbar.pack_end (search_entry);
 
         // App Menu (this gives access to the About dialog)
-        var main_menu = create_appmenu (new Gtk.Menu ());
+        var menu = new Gtk.Menu ();
+        var fullscreen_item = new Gtk.MenuItem.with_label ("Fullscreen");
+        fullscreen_item.activate.connect (() => {
+            if (fullscreen == false) {
+                window.fullscreen ();
+                fullscreen = true;
+            } else  {
+                window.unfullscreen ();
+                fullscreen = false;
+            }
+        
+        });
+        menu.add (fullscreen_item);
+        
+        var main_menu = create_appmenu (menu);
         main_menu.margin_left = 12;
-        main_toolbar.insert (main_menu, -1);
+        main_toolbar.pack_end (main_menu);
 
         window.set_default_size (800, 550);
         window.show_all ();
@@ -464,4 +459,4 @@
 
         return application.run (args);
     }
-}
+}
\ No newline at end of file

=== modified file 'lib/CMakeLists.txt'
--- lib/CMakeLists.txt	2013-07-16 23:31:04 +0000
+++ lib/CMakeLists.txt	2013-12-22 03:34:36 +0000
@@ -31,6 +31,7 @@
     Widgets/DynamicNotebook.vala
     Widgets/CompositedWindow.vala
     Widgets/AppMenu.vala
+    Widgets/HeaderBar.vala
     Widgets/Welcome.vala
     Widgets/ToolButtonWithMenu.vala
     Widgets/PopOver.vala
@@ -84,6 +85,8 @@
     ${PKG_NAME}
 GENERATE_VAPI
     ${PKG_NAME}
+GENERATE_GIR
+    ${PKG_GIR_NAME}
 CUSTOM_VAPIS
     ${CMAKE_CURRENT_SOURCE_DIR}/config.vapi
 OPTIONS
@@ -94,6 +97,8 @@
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${PKG_NAME}.deps DESTINATION ${CMAKE_INSTALL_PREFIX}/share/vala/vapi)
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${PKG_NAME}.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${PKG_NAME})
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/Widgets/widgets-utils.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/${PKG_NAME})
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${PKG_GIR_NAME}.gir DESTINATION ${CMAKE_INSTALL_PREFIX}/share/gir-1.0/)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${PKG_GIR_NAME}.typelib DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/girepository-1.0/)
 
 set (LIB_FILES ${C_SOURCES} ${VALA_C})
 
@@ -106,14 +111,3 @@
     SOVERSION ${PKG_SOVERSION})
 
 install (TARGETS ${PKG_NAME} DESTINATION ${LIB_INSTALL_DIR})
-
-###########################
-# GObject Introspection
-###########################
-
-include (FindGObjectIntrospection)
-
-if (INTROSPECTION_FOUND)
-    include (GObjectIntrospectionMacros)
-    add_target_gir (${PKG_NAME} ${PKG_GIR_NAME} ${PKG_NAME}.h "${VALA_C}" "${DEPS_CFLAGS}" ${API_VERSION} ${GI_PKG_DEPS})
-endif ()

=== added file 'lib/Widgets/HeaderBar.vala'
--- lib/Widgets/HeaderBar.vala	1970-01-01 00:00:00 +0000
+++ lib/Widgets/HeaderBar.vala	2013-12-22 03:34:36 +0000
@@ -0,0 +1,314 @@
+/***
+    Copyright (C) 2011-2013 Granite Developers
+
+    This program or library is free software; you can redistribute it
+    and/or modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 3 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+    Lesser General Public License for more details.
+ 
+    You should have received a copy of the GNU Lesser General
+    Public License along with this library; if not, write to the
+    Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+    Boston, MA 02110-1301 USA.
+
+    Authored by: Corentin Noël <[e-mail]>
+***/
+
+namespace Granite.Widgets {
+
+    /**
+     * This class is a standard header bar.
+     */
+    public class HeaderBar : Gtk.HeaderBar {
+        
+        // Same value as int the Gtk+3 source
+        private const int DEFAULT_SPACING = 6;
+        
+        private Gtk.Revealer revealer;
+        private Gtk.Window window;
+        private Gtk.Toolbar toolbar;
+        private Gee.HashMap<int, unowned Gtk.Widget> widgets_left;
+        private Gee.HashMap<int, unowned Gtk.Widget> widgets_right;
+        private int left_size = 0;
+        private int right_size = 0;
+        private Gtk.Grid left_grid_toolbar;
+        private Gtk.Grid right_grid_toolbar;
+        private Gtk.Grid widget_grid_toolbar;
+        private Gtk.Grid left_grid_header;
+        private Gtk.Grid right_grid_header;
+        private Gtk.Grid widget_grid_header;
+        private Gtk.Button resize_button;
+        private Gtk.Widget header_center_widget;
+        
+        private bool toolbar_shown = false;
+        private bool widgets_on_toolbar = false;
+        
+        /**
+         * This method sets an HeaderBar to the window
+         *
+         * @param window window to set the HeaderBar
+         * @since 0.3
+         */
+        public HeaderBar (Gtk.Window window) {
+            
+            widgets_left = new Gee.HashMap<int, unowned Gtk.Widget> ();
+            widgets_right = new Gee.HashMap<int, unowned Gtk.Widget> ();
+            
+            show_close_button = true;
+            
+            this.window = window;
+            window.set_titlebar (this);
+            this.get_style_context ().add_class ("header-bar");
+            this.get_style_context ().add_class (Gtk.STYLE_CLASS_HORIZONTAL);
+            
+            revealer = new Gtk.Revealer ();
+            toolbar = new Gtk.Toolbar ();
+            toolbar.get_style_context ().add_class ("header-bar");
+            toolbar.hexpand = true;
+            toolbar.vexpand = false;
+            
+            left_grid_toolbar = new Gtk.Grid ();
+            left_grid_toolbar.get_style_context ().add_class ("header-bar");
+            left_grid_toolbar.column_spacing = DEFAULT_SPACING;
+            right_grid_toolbar = new Gtk.Grid ();
+            right_grid_toolbar.get_style_context ().add_class ("header-bar");
+            right_grid_toolbar.column_spacing = DEFAULT_SPACING;
+            
+            widget_grid_toolbar = new Gtk.Grid ();
+            header_center_widget = custom_title;
+            widget_grid_header = new Gtk.Grid ();
+            
+            left_grid_header = new Gtk.Grid ();
+            left_grid_header.expand = true;
+            left_grid_header.get_style_context ().add_class ("header-bar");
+            left_grid_header.column_spacing = DEFAULT_SPACING;
+            base.pack_start (left_grid_header);
+            right_grid_header = new Gtk.Grid ();
+            right_grid_header.expand = true;
+            right_grid_header.get_style_context ().add_class ("header-bar");
+            right_grid_header.column_spacing = DEFAULT_SPACING;
+            base.pack_end (right_grid_header);
+            
+            get_resize_button ();
+            
+            var left_toolitem = new Gtk.ToolItem ();
+            left_toolitem.add (left_grid_toolbar);
+            
+            var widget_toolitem = new Gtk.ToolItem ();
+            widget_toolitem.add (widget_grid_toolbar);
+            
+            var right_toolitem = new Gtk.ToolItem ();
+            right_toolitem.add (right_grid_toolbar);
+            
+            var fake_toolitem = new Gtk.ToolItem ();
+            fake_toolitem.set_expand (true);
+            fake_toolitem.hexpand = false;
+            
+            var fake2_toolitem = new Gtk.ToolItem ();
+            fake2_toolitem.set_expand (true);
+            fake2_toolitem.hexpand = false;
+            
+            toolbar.insert (fake_toolitem, 0);
+            toolbar.insert (widget_toolitem, 0);
+            toolbar.insert (fake2_toolitem, 0);
+            toolbar.insert (left_toolitem, 0);
+            toolbar.insert (right_toolitem, -1);
+            
+            revealer.add (toolbar);
+            
+            window.add_events (Gdk.EventMask.STRUCTURE_MASK);
+            window.add_events (Gdk.EventMask.POINTER_MOTION_MASK);
+            
+            window.motion_notify_event.connect (update_pointer_position);
+            window.window_state_event.connect (got_window_state_event);
+        }
+        
+        private bool got_window_state_event (Gdk.EventWindowState event) {
+            if (toolbar_shown == true &&
+                    (((window.get_window ().get_state () & Gdk.WindowState.FULLSCREEN) != 0) == false)) {
+                hide_revealer ();
+                revealer.hide ();
+            }
+            if ((((window.get_window ().get_state () & Gdk.WindowState.FULLSCREEN) != 0) == false) && 
+                    ((window.get_window ().get_state () & Gdk.WindowState.MAXIMIZED) != 0)) {
+                toggle_maximized_button (true);
+            } else if ((((window.get_window ().get_state () & Gdk.WindowState.FULLSCREEN) != 0) == false) && 
+                    (((window.get_window ().get_state () & Gdk.WindowState.MAXIMIZED) != 0)) == false) {
+                toggle_maximized_button (false);
+            }
+            return false;
+        }
+        
+        private void get_resize_button () {
+            bool maximized = ((window.get_window ().get_state () & Gdk.WindowState.MAXIMIZED) != 0);
+
+            var icon_name = maximized ? "window-restore-symbolic" : "window-maximize-symbolic";
+            resize_button = new Gtk.Button.from_icon_name (icon_name, Gtk.IconSize.MENU);
+            resize_button.get_style_context ().add_class ("titlebutton");
+            resize_button.set_can_focus (false);
+            resize_button.clicked.connect (toggle_maximized);
+            resize_button.set_valign (Gtk.Align.CENTER);
+            
+            if (window.resizable == true) {
+                resize_button.show ();
+            } else {
+                resize_button.hide ();
+            }
+            
+            base.pack_end (resize_button);
+        }
+        
+        private void toggle_maximized () {
+            if (((window.get_window ().get_state () & Gdk.WindowState.MAXIMIZED) != 0)) {
+                window.unmaximize ();
+            } else {
+                window.maximize ();
+            }
+        }
+        
+        private void toggle_maximized_button (bool maximized) {
+            
+            if (window.resizable == true) {
+                resize_button.show ();
+            } else {
+                resize_button.hide ();
+            }
+            
+            if (maximized) {
+                resize_button.set_image (new Gtk.Image.from_icon_name ("window-restore-symbolic", Gtk.IconSize.MENU));
+            } else {
+                resize_button.set_image (new Gtk.Image.from_icon_name ("window-maximize-symbolic", Gtk.IconSize.MENU));
+            }
+        }
+        
+        private bool update_pointer_position (Gdk.EventMotion event) {
+            int size = 5;
+            if (toolbar_shown == true) {
+                int minimum_height = 0;
+                int natural_height = 0;
+                toolbar.get_preferred_height (out minimum_height, out natural_height);
+                size = natural_height;
+                if (size < 5)
+                    size = 5;
+            }
+            
+            if (toolbar_shown == false && event.y <= size && 
+                    ((window.get_window ().get_state () & Gdk.WindowState.FULLSCREEN) != 0)) {
+                revealer.show ();
+                show_revealer ();
+            } else if (toolbar_shown == true && event.y > size && 
+                    ((window.get_window ().get_state () & Gdk.WindowState.FULLSCREEN) != 0)) {
+                revealer.show ();
+                hide_revealer ();
+            } else if (toolbar_shown == true &&
+                    (((window.get_window ().get_state () & Gdk.WindowState.FULLSCREEN) != 0) == false)) {
+                hide_revealer ();
+                revealer.hide ();
+            }
+            return false;
+        }
+        
+        private void show_revealer () {
+            if (widgets_on_toolbar == false) {
+                foreach (var entry in widgets_left.entries) {
+                    if (entry.value == null)
+                        continue;
+                    entry.value.reparent (left_grid_toolbar);
+                }
+                foreach (var entry in widgets_right.entries) {
+                    if (entry.value == null)
+                        continue;
+                    entry.value.reparent (right_grid_toolbar);
+                }
+                if (header_center_widget != null)
+                    header_center_widget.reparent (widget_grid_toolbar);
+                widgets_on_toolbar = true;
+            }
+            revealer.set_transition_type (Gtk.RevealerTransitionType.SLIDE_DOWN);
+            toolbar_shown = true;
+            revealer.set_reveal_child (true);
+        }
+        
+        private void hide_revealer () {
+            if (widgets_on_toolbar == true) {
+                foreach (var entry in widgets_left.entries) {
+                    if (entry.value == null)
+                        continue;
+                    entry.value.reparent (left_grid_header);
+                }
+                foreach (var entry in widgets_right.entries) {
+                    if (entry.value == null)
+                        continue;
+                    entry.value.reparent (right_grid_header);
+                }
+                if (header_center_widget != null)
+                    header_center_widget.reparent (widget_grid_header);
+                widgets_on_toolbar = false;
+            }
+            revealer.set_transition_type (Gtk.RevealerTransitionType.SLIDE_UP);
+            toolbar_shown = false;
+            revealer.set_reveal_child (false);
+        }
+        
+        /**
+         * Get the Toolbar that will be shown in fullscreen mode.
+         *
+         * @return A {@link Gtk.Revealer} that should be set in the top of the window, expanded horizontally.
+         * @since 0.3
+         */
+        public Gtk.Revealer get_revealer () {
+            return revealer;
+        }
+        
+        /**
+         * {@inheritDoc}
+         * @since 0.3
+         */
+        public new weak Gtk.Widget get_custom_title () {
+            return header_center_widget;
+        }
+        
+        /**
+         * {@inheritDoc}
+         * @since 0.3
+         */
+        public new void set_custom_title (Gtk.Widget title_widget) {
+            widget_grid_header = new Gtk.Grid ();
+            widget_grid_header.add (title_widget);
+            header_center_widget = title_widget;
+            if (title_widget == null)
+                base.set_custom_title (null);
+            else
+                base.set_custom_title (widget_grid_header);
+        }
+        
+        /**
+         * {@inheritDoc}
+         * @since 0.3
+         */
+        public new void pack_end (Gtk.Widget child) {
+            widgets_right.set (right_size, child);
+            child.valign = Gtk.Align.CENTER;
+            child.vexpand = true;
+            right_grid_header.attach (child, right_size, 0, 1, 1);
+            right_size++;
+        }
+        
+        /**
+         * {@inheritDoc}
+         * @since 0.3
+         */
+        public new void pack_start (Gtk.Widget child) {
+            widgets_left.set (left_size, child);
+            child.valign = Gtk.Align.CENTER;
+            child.vexpand = true;
+            left_grid_header.attach (child, left_size, 0, 1, 1);
+            left_size++;
+        }
+    }
+}
\ No newline at end of file