Merge pull request #4865 from mmattes/feature/floatbar
authorakallabeth <akallabeth@users.noreply.github.com>
Tue, 25 Sep 2018 14:34:20 +0000 (16:34 +0200)
committerGitHub <noreply@github.com>
Tue, 25 Sep 2018 14:34:20 +0000 (16:34 +0200)
Feature/floatbar for X11

1  2 
client/Windows/wf_client.c
client/X11/xf_client.c
client/X11/xf_event.c
client/X11/xf_window.c
client/X11/xfreerdp.h
client/common/cmdline.c
client/common/cmdline.h
include/freerdp/settings.h
libfreerdp/core/settings.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -319,9 -319,9 +319,10 @@@ rdpSettings* freerdp_settings_new(DWOR
        settings->GatewayPort = 443;
        settings->DesktopResize = TRUE;
        settings->ToggleFullscreen = TRUE;
+       settings->Floatbar = TRUE;
        settings->DesktopPosX = 0;
        settings->DesktopPosY = 0;
 +      settings->SoftwareGdi = TRUE;
        settings->UnmapButtons = FALSE;
        settings->PerformanceFlags = PERF_FLAG_NONE;
        settings->AllowFontSmoothing = FALSE;