More consistent fullscreen handling
This commit is contained in:
parent
b464a3ed4d
commit
8104c13398
|
@ -271,10 +271,24 @@ void pdfviewer_delete(PDFviewer * pdfviewer)
|
||||||
void pdfviewer_set_fullscreen(PDFviewer * pdfviewer, gboolean fullscreen)
|
void pdfviewer_set_fullscreen(PDFviewer * pdfviewer, gboolean fullscreen)
|
||||||
{
|
{
|
||||||
if(fullscreen == TRUE)
|
if(fullscreen == TRUE)
|
||||||
|
{
|
||||||
|
#ifndef EMBEDDED
|
||||||
|
gtk_widget_hide(pdfviewer->menubar);
|
||||||
|
#endif
|
||||||
|
gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(
|
||||||
|
pdfviewer->tb_fullscreen), TRUE);
|
||||||
gtk_window_fullscreen(GTK_WINDOW(pdfviewer->window));
|
gtk_window_fullscreen(GTK_WINDOW(pdfviewer->window));
|
||||||
|
}
|
||||||
else
|
else
|
||||||
|
{
|
||||||
|
#ifndef EMBEDDED
|
||||||
|
gtk_widget_show(pdfviewer->menubar);
|
||||||
|
#endif
|
||||||
|
gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(
|
||||||
|
pdfviewer->tb_fullscreen), FALSE);
|
||||||
gtk_window_unfullscreen(GTK_WINDOW(pdfviewer->window));
|
gtk_window_unfullscreen(GTK_WINDOW(pdfviewer->window));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/* useful */
|
/* useful */
|
||||||
|
@ -357,24 +371,10 @@ void pdfviewer_fullscreen_toggle(PDFviewer * pdfviewer)
|
||||||
#endif
|
#endif
|
||||||
if((gdk_window_get_state(window) & GDK_WINDOW_STATE_FULLSCREEN)
|
if((gdk_window_get_state(window) & GDK_WINDOW_STATE_FULLSCREEN)
|
||||||
!= GDK_WINDOW_STATE_FULLSCREEN)
|
!= GDK_WINDOW_STATE_FULLSCREEN)
|
||||||
{
|
|
||||||
#ifndef EMBEDDED
|
|
||||||
gtk_widget_hide(pdfviewer->menubar);
|
|
||||||
#endif
|
|
||||||
gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(
|
|
||||||
pdfviewer->tb_fullscreen), TRUE);
|
|
||||||
pdfviewer_set_fullscreen(pdfviewer, TRUE);
|
pdfviewer_set_fullscreen(pdfviewer, TRUE);
|
||||||
}
|
|
||||||
else
|
else
|
||||||
{
|
|
||||||
#ifndef EMBEDDED
|
|
||||||
gtk_widget_show(pdfviewer->menubar);
|
|
||||||
#endif
|
|
||||||
gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(
|
|
||||||
pdfviewer->tb_fullscreen), FALSE);
|
|
||||||
pdfviewer_set_fullscreen(pdfviewer, FALSE);
|
pdfviewer_set_fullscreen(pdfviewer, FALSE);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/* pdfviewer_open */
|
/* pdfviewer_open */
|
||||||
|
|
Loading…
Reference in New Issue
Block a user