Mirrors/rofi
2
0
Fork 0
mirror of https://github.com/lbonn/rofi synced 2025-02-20 14:58:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix fullscreen in wayland mode

Browse source 
Fixes #6
This commit is contained in:
lbonn 2020-09-02 20:51:10 +02:00
parent 1f828cb2c5
commit 2e1e362fd3
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
source/wayland/view.c
View file

@ -241,8 +241,8 @@ static void wayland___create_window ( MenuFlags menu_flags )
WlState.flags = menu_flags; WlState.flags = menu_flags;
// Setup font. // Setup font.
// Dummy widget. // Dummy widget.
box *box = box_create ( NULL, "window", ROFI_ORIENTATION_HORIZONTAL ); box *win = box_create ( NULL, "window", ROFI_ORIENTATION_HORIZONTAL );
const char *font = rofi_theme_get_string ( WIDGET ( box ), "font", config.menu_font ); const char *font = rofi_theme_get_string ( WIDGET ( win ), "font", config.menu_font );
if ( font ) { if ( font ) {
PangoFontDescription *pfd = pango_font_description_from_string ( font ); PangoFontDescription *pfd = pango_font_description_from_string ( font );
if ( helper_validate_font ( pfd, font ) ) { if ( helper_validate_font ( pfd, font ) ) {
@ -259,7 +259,10 @@ static void wayland___create_window ( MenuFlags menu_flags )
// cleanup // cleanup
g_object_unref ( p ); g_object_unref ( p );
widget_free ( WIDGET ( box ) ); WlState.fullscreen = rofi_theme_get_boolean ( WIDGET ( win ), "fullscreen", config.fullscreen );
widget_free ( WIDGET ( win ) );
TICK_N ( "done" ); TICK_N ( "done" );
} }
@ -270,12 +273,18 @@ static void wayland___create_window ( MenuFlags menu_flags )
*/ */
static void wayland_rofi_view_calculate_window_width ( RofiViewState *state ) static void wayland_rofi_view_calculate_window_width ( RofiViewState *state )
{ {
if ( WlState.fullscreen == TRUE ) {
int width = 1280;
display_get_surface_dimensions ( &width, NULL );
state->width = width;
return;
}
if ( config.menu_width < 0 ) { if ( config.menu_width < 0 ) {
double fw = textbox_get_estimated_char_width ( ); double fw = textbox_get_estimated_char_width ( );
state->width = -( fw * config.menu_width ); state->width = -( fw * config.menu_width );
state->width += widget_padding_get_padding_width ( WIDGET ( state->main_window ) ); state->width += widget_padding_get_padding_width ( WIDGET ( state->main_window ) );
} } else {
else {
int width = 1920; int width = 1920;
// Calculate as float to stop silly, big rounding down errors. // Calculate as float to stop silly, big rounding down errors.
display_get_surface_dimensions ( &width, NULL ); display_get_surface_dimensions ( &width, NULL );