show titlebar again for remaining drivers

This commit is contained in:
Brad Parker 2017-01-19 18:08:39 +00:00
parent c0e55cba37
commit a54ea9ad88
8 changed files with 23 additions and 40 deletions

View File

@ -502,6 +502,7 @@ static bool sdl2_gfx_frame(void *data, const void *frame, unsigned width,
unsigned pitch, const char *msg, video_frame_info_t *video_info)
{
sdl2_video_t *vid = (sdl2_video_t*)data;
char title[128];
if (vid->should_resize)
sdl_refresh_viewport(vid);
@ -534,17 +535,12 @@ static bool sdl2_gfx_frame(void *data, const void *frame, unsigned width,
SDL_RenderPresent(vid->renderer);
if (video_info->monitor_fps_enable)
{
char title[128];
title[0] = '\0';
title[0] = '\0';
video_driver_get_window_title(title, sizeof(title));
video_driver_get_window_title(title, sizeof(title));
if (title[0])
SDL_SetWindowTitle(vid->window, title);
}
if (title[0])
SDL_SetWindowTitle(vid->window, title);
return true;
}

View File

@ -423,6 +423,7 @@ static void *xv_init(const video_info_t *video,
XWindowAttributes target;
video_frame_info_t video_info;
char buf[128] = {0};
char title[128] = {0};
XSetWindowAttributes attributes = {0};
XVisualInfo visualtemplate = {0};
unsigned width = 0;
@ -539,17 +540,10 @@ static void *xv_init(const video_info_t *video,
video_driver_build_info(&video_info);
if (video_info.monitor_fps_enable)
{
char title[128];
video_driver_get_window_title(title, sizeof(title));
title[0] = '\0';
video_driver_get_window_title(title, sizeof(title));
if (title[0])
XStoreName(g_x11_dpy, g_x11_win, title);
}
if (title[0])
XStoreName(g_x11_dpy, g_x11_win, title);
x11_set_window_attr(g_x11_dpy, g_x11_win);

View File

@ -424,7 +424,7 @@ static void cocoagl_gfx_ctx_update_title(void *data, video_frame_info_t *video_i
view.data = (CocoaView*)nsview_get_ptr();
if (window && video_info->monitor_fps_enable)
if (window)
{
char title[128];

View File

@ -101,7 +101,7 @@ static void gfx_ctx_d3d_update_title(void *data, video_frame_info_t *video_info)
#else
const ui_window_t *window = ui_companion_driver_get_window_ptr();
if (window && video_info->monitor_fps_enable)
if (window)
{
char title[128];

View File

@ -89,18 +89,14 @@ static bool gfx_ctx_gdi_set_resize(void *data,
static void gfx_ctx_gdi_update_window_title(void *data, video_frame_info_t *video_info)
{
const ui_window_t *window = ui_companion_driver_get_window_ptr();
char title[128];
if (window && video_info->monitor_fps_enable)
{
char title[128];
title[0] = '\0';
title[0] = '\0';
video_driver_get_window_title(title, sizeof(title));
video_driver_get_window_title(title, sizeof(title));
if (title[0])
window->set_title(&main_window, title);
}
if (window && title[0])
window->set_title(&main_window, title);
}
static void gfx_ctx_gdi_get_video_size(void *data,

View File

@ -274,18 +274,15 @@ static void sdl_ctx_update_title(void *data, video_frame_info_t *video_info)
video_driver_get_window_title(title, sizeof(title));
if (video_info->monitor_fps_enable)
{
#ifdef HAVE_SDL2
gfx_ctx_sdl_data_t *sdl = (gfx_ctx_sdl_data_t*)data;
gfx_ctx_sdl_data_t *sdl = (gfx_ctx_sdl_data_t*)data;
if (sdl && title[0])
SDL_SetWindowTitle(sdl->g_win, title);
if (sdl && title[0])
SDL_SetWindowTitle(sdl->g_win, title);
#else
if (title[0])
SDL_WM_SetCaption(title, NULL);
if (title[0])
SDL_WM_SetCaption(title, NULL);
#endif
}
}
static void sdl_ctx_check_window(void *data, bool *quit, bool *resize,unsigned *width,

View File

@ -725,7 +725,7 @@ static void gfx_ctx_wl_update_title(void *data, video_frame_info_t *video_info)
video_driver_get_window_title(title, sizeof(title));
if (wl && title[0] && video_info->monitor_fps_enable)
if (wl && title[0])
wl_shell_surface_set_title(wl->shell_surf, title);
}

View File

@ -389,7 +389,7 @@ static void gfx_ctx_wgl_update_title(void *data, video_frame_info_t *video_info)
{
const ui_window_t *window = ui_companion_driver_get_window_ptr();
if (window && video_info->monitor_fps_enable)
if (window)
{
char title[128];