Andreas Butti
7 years ago
parent
5525563361
commit
ee8c40cb89
5 changed files with 324 additions and 59 deletions
@ -0,0 +1,245 @@ |
||||
#include "FullscreenHandler.h" |
||||
|
||||
#include "Control.h" |
||||
#include "gui/MainWindow.h" |
||||
|
||||
#include <StringUtils.h> |
||||
|
||||
GtkWidget* gtk_invisible_new(); |
||||
|
||||
FullscreenHandler::FullscreenHandler(Settings* settings) |
||||
: settings(settings) |
||||
{ |
||||
XOJ_INIT_TYPE(FullscreenHandler); |
||||
} |
||||
|
||||
FullscreenHandler::~FullscreenHandler() |
||||
{ |
||||
XOJ_CHECK_TYPE(FullscreenHandler); |
||||
|
||||
XOJ_RELEASE_TYPE(FullscreenHandler); |
||||
} |
||||
|
||||
bool FullscreenHandler::isFullscreen() |
||||
{ |
||||
XOJ_CHECK_TYPE(FullscreenHandler); |
||||
|
||||
return this->fullscreen; |
||||
} |
||||
|
||||
void FullscreenHandler::hideWidget(MainWindow* win, string widgetName) |
||||
{ |
||||
XOJ_CHECK_TYPE(FullscreenHandler); |
||||
|
||||
if ("sidebarContents" == widgetName && settings->isSidebarVisible()) |
||||
{ |
||||
this->sidebarHidden = true; |
||||
win->setSidebarVisible(false); |
||||
|
||||
return; |
||||
} |
||||
|
||||
if ("mainMenubar" == widgetName) |
||||
{ |
||||
// If the menu is hidden, shortcuts are not working anymore
|
||||
// therefore the menu is not hidden, it's displayed, but invisible
|
||||
// this costs 1px at the bottom, even if the preferred size is 0px,
|
||||
// 1px is used by GTK
|
||||
|
||||
GtkWidget* mainMenubar = win->get("mainMenubar"); |
||||
GtkWidget* mainBox = win->get("mainBox"); |
||||
|
||||
if (mainMenubar == NULL || !gtk_widget_is_visible(mainMenubar)) |
||||
{ |
||||
// Menu not visible (global menu or something like this)
|
||||
return; |
||||
} |
||||
|
||||
// Remove menu from parent
|
||||
gtk_container_remove(GTK_CONTAINER(gtk_widget_get_parent(mainMenubar)), mainMenubar); |
||||
|
||||
GtkWidget* fix = gtk_invisible_new(); |
||||
|
||||
gtk_widget_set_size_request(fix, 0, 0); |
||||
gtk_fixed_put(GTK_FIXED(fix), mainMenubar, 0, 0); |
||||
|
||||
gtk_widget_show(fix); |
||||
|
||||
gtk_box_pack_end(GTK_BOX(mainBox), fix, false, false, 0); |
||||
|
||||
menubarHidden = true; |
||||
|
||||
return; |
||||
} |
||||
|
||||
return; |
||||
|
||||
GtkWidget* w = win->get(widgetName); |
||||
if (w == NULL) |
||||
{ |
||||
g_warning("Fullscreen: Try to hide \"%s\", but coulden't find it. Wrong entry in ~/" |
||||
CONFIG_DIR "/" SETTINGS_XML_FILE "?", widgetName.c_str()); |
||||
return; |
||||
} |
||||
|
||||
if (gtk_widget_get_visible(w)) |
||||
{ |
||||
gtk_widget_hide(w); |
||||
hiddenFullscreenWidgets.push_back(w); |
||||
} |
||||
} |
||||
|
||||
void FullscreenHandler::enableFullscreen(MainWindow* win, string hideWidgets) |
||||
{ |
||||
XOJ_CHECK_TYPE(FullscreenHandler); |
||||
|
||||
gtk_window_fullscreen((GtkWindow*) *win); |
||||
|
||||
for (string s : StringUtils::split(hideWidgets, ',')) |
||||
{ |
||||
hideWidget(win, s); |
||||
} |
||||
} |
||||
|
||||
void FullscreenHandler::disableFullscreen(MainWindow* win) |
||||
{ |
||||
XOJ_CHECK_TYPE(FullscreenHandler); |
||||
|
||||
gtk_window_unfullscreen((GtkWindow*) *win); |
||||
|
||||
for (GtkWidget* w : hiddenFullscreenWidgets) |
||||
{ |
||||
gtk_widget_show(w); |
||||
} |
||||
hiddenFullscreenWidgets.clear(); |
||||
|
||||
if (this->sidebarHidden) |
||||
{ |
||||
this->sidebarHidden = false; |
||||
win->setSidebarVisible(true); |
||||
} |
||||
|
||||
if (this->menubarHidden) |
||||
{ |
||||
GtkWidget* mainMenubar = win->get("mainMenubar"); |
||||
GtkWidget* mainBox = win->get("mainBox"); |
||||
|
||||
GtkWidget* parent = gtk_widget_get_parent(mainMenubar); |
||||
|
||||
// Remove menu from parent
|
||||
gtk_container_remove(GTK_CONTAINER(parent), mainMenubar); |
||||
gtk_box_pack_start(GTK_BOX(mainBox), mainMenubar, false, true, 0); |
||||
|
||||
|
||||
GValue value = G_VALUE_INIT; |
||||
g_value_init(&value, G_TYPE_INT); |
||||
g_value_set_int(&value, 0); |
||||
gtk_container_child_set_property(GTK_CONTAINER(mainBox), mainMenubar, "position", &value); |
||||
|
||||
// not needed, will be recreated next time
|
||||
gtk_widget_destroy(parent); |
||||
|
||||
menubarHidden = false; |
||||
} |
||||
} |
||||
|
||||
void FullscreenHandler::enableFullscreen(MainWindow* win, bool enabled, bool presentation) |
||||
{ |
||||
XOJ_CHECK_TYPE(FullscreenHandler); |
||||
|
||||
if (enabled) |
||||
{ |
||||
enableFullscreen(win, presentation ? settings->getPresentationHideElements() : settings->getFullscreenHideElements()); |
||||
} |
||||
else |
||||
{ |
||||
disableFullscreen(win); |
||||
} |
||||
|
||||
this->fullscreen = enabled; |
||||
} |
||||
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
// Widget which allow to hide the menu, but let the shortcuts active
|
||||
///////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
typedef struct
|
||||
{ |
||||
GtkFixedClass parent_class; |
||||
} GtkInvisibleMenuClass; |
||||
|
||||
typedef struct
|
||||
{ |
||||
GtkFixed widget; |
||||
} GtkInvisibleMenu; |
||||
|
||||
static void gtk_invisible_menu_get_preferred_width(GtkWidget *widget, gint *minimum, gint *natural) |
||||
{ |
||||
*minimum = 0; |
||||
*natural = 0; |
||||
} |
||||
|
||||
static void gtk_invisible_menu_get_preferred_height(GtkWidget *widget, gint *minimum, gint *natural) |
||||
{ |
||||
*minimum = 0; |
||||
*natural = 0; |
||||
} |
||||
|
||||
static gboolean gtk_invisible_menu_draw(GtkWidget *widget, cairo_t *cr) |
||||
{ |
||||
return FALSE; |
||||
} |
||||
|
||||
static void gtk_invisible_menu_class_init(GtkInvisibleMenuClass* klass) |
||||
{ |
||||
GtkWidgetClass* widget_class; |
||||
|
||||
widget_class = (GtkWidgetClass*) klass; |
||||
widget_class->get_preferred_width = gtk_invisible_menu_get_preferred_width; |
||||
widget_class->get_preferred_height = gtk_invisible_menu_get_preferred_height; |
||||
widget_class->draw = gtk_invisible_menu_draw; |
||||
} |
||||
|
||||
GType gtk_invisible_get_type() |
||||
{ |
||||
static GType gtk_invisible_menu_type = 0; |
||||
|
||||
if (!gtk_invisible_menu_type) |
||||
{ |
||||
static const GTypeInfo gtk_inivisible_menu_info = |
||||
{ |
||||
sizeof(GtkInvisibleMenuClass), |
||||
// base initialize
|
||||
NULL, |
||||
// base finalize
|
||||
NULL, |
||||
// class initialize
|
||||
(GClassInitFunc) gtk_invisible_menu_class_init, |
||||
// class finalize
|
||||
NULL, |
||||
// class data,
|
||||
NULL, |
||||
// instance size
|
||||
sizeof(GtkInvisibleMenu), |
||||
// n_preallocs
|
||||
0, |
||||
// instance init
|
||||
NULL, |
||||
// value table
|
||||
(const GTypeValueTable*) NULL |
||||
}; |
||||
|
||||
gtk_invisible_menu_type = g_type_register_static(GTK_TYPE_FIXED, |
||||
"GtkInvisibleMenu", |
||||
>k_inivisible_menu_info, |
||||
(GTypeFlags) 0); |
||||
} |
||||
|
||||
return gtk_invisible_menu_type; |
||||
} |
||||
|
||||
GtkWidget* gtk_invisible_new() |
||||
{ |
||||
return GTK_WIDGET(g_object_new(gtk_invisible_get_type(), NULL)); |
||||
} |
||||
@ -0,0 +1,64 @@ |
||||
/*
|
||||
* Xournal++ |
||||
* |
||||
* Fullscreen handler |
||||
* |
||||
* @author Xournal++ Team |
||||
* https://github.com/xournalpp/xournalpp
|
||||
* |
||||
* @license GNU GPLv2 or later |
||||
*/ |
||||
|
||||
#pragma once |
||||
|
||||
#include <XournalType.h> |
||||
|
||||
#include <gtk/gtk.h> |
||||
|
||||
class Settings; |
||||
class MainWindow; |
||||
|
||||
class FullscreenHandler |
||||
{ |
||||
public: |
||||
FullscreenHandler(Settings* settings); |
||||
virtual ~FullscreenHandler(); |
||||
|
||||
public: |
||||
bool isFullscreen(); |
||||
|
||||
void enableFullscreen(MainWindow* win, bool enabled, bool presentation = false); |
||||
|
||||
private: |
||||
void enableFullscreen(MainWindow* win, string hideWidgets); |
||||
void hideWidget(MainWindow* win, string widgetName); |
||||
void disableFullscreen(MainWindow* win); |
||||
|
||||
private: |
||||
XOJ_TYPE_ATTRIB; |
||||
|
||||
/**
|
||||
* Settings |
||||
*/ |
||||
Settings* settings; |
||||
|
||||
/**
|
||||
* Fullscreen enabled |
||||
*/ |
||||
bool fullscreen = false; |
||||
|
||||
/**
|
||||
* If the sidebar was hidden |
||||
*/ |
||||
bool sidebarHidden = false; |
||||
|
||||
/**
|
||||
* The menubar was hidden |
||||
*/ |
||||
bool menubarHidden = false; |
||||
|
||||
/**
|
||||
* Currently hidden widgets |
||||
*/ |
||||
vector<GtkWidget*> hiddenFullscreenWidgets; |
||||
}; |
||||
Loading…
Reference in new issue