mirror of
https://gitlab.freedesktop.org/wayland/wayland.git
synced 2025-11-06 13:29:48 -05:00
Merge remote branch 'callum/master'
Conflicts: clients/window.h
This commit is contained in:
commit
6ec41abf72
3 changed files with 91 additions and 12 deletions
|
|
@ -1233,6 +1233,19 @@ window_set_keyboard_focus_handler(struct window *window,
|
|||
window->keyboard_focus_handler = handler;
|
||||
}
|
||||
|
||||
void
|
||||
window_set_title(struct window *window, const char *title)
|
||||
{
|
||||
free((void*) window->title);
|
||||
window->title = strdup(title);
|
||||
}
|
||||
|
||||
const char *
|
||||
window_get_title(struct window *window)
|
||||
{
|
||||
return window->title;
|
||||
}
|
||||
|
||||
void
|
||||
window_damage(struct window *window, int32_t x, int32_t y,
|
||||
int32_t width, int32_t height)
|
||||
|
|
@ -1273,12 +1286,6 @@ window_create_internal(struct display *display, struct window *parent,
|
|||
return window;
|
||||
}
|
||||
|
||||
void
|
||||
window_set_title(struct window *window, const char *title)
|
||||
{
|
||||
window->title = strdup(title);
|
||||
}
|
||||
|
||||
struct window *
|
||||
window_create(struct display *display, int32_t width, int32_t height)
|
||||
{
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue