Merge branch 'master' into nagbar

This commit is contained in:
Ryan Dwyer 2018-08-02 23:05:49 +10:00 committed by GitHub
commit 706c0fbe23
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 77 additions and 73 deletions

View file

@ -42,17 +42,4 @@ void transaction_notify_view_ready(struct sway_view *view, uint32_t serial);
void transaction_notify_view_ready_by_size(struct sway_view *view,
int width, int height);
/**
* Get the saved texture that should be rendered for a view.
*
* The addresses pointed at by the width and height pointers will be populated
* with the surface's dimensions, which may be different to the texture's
* dimensions if output scaling is used.
*
* This function should only be called if it is known that the view has
* instructions.
*/
struct wlr_texture *transaction_get_saved_texture(struct sway_view *view,
int *width, int *height);
#endif

View file

@ -85,6 +85,9 @@ struct sway_view {
bool allow_request_urgent;
struct wl_event_source *urgent_timer;
struct wlr_buffer *saved_buffer;
int saved_buffer_width, saved_buffer_height;
bool destroying;
list_t *executed_criteria; // struct criteria *
@ -339,4 +342,8 @@ void view_set_urgent(struct sway_view *view, bool enable);
bool view_is_urgent(struct sway_view *view);
void view_remove_saved_buffer(struct sway_view *view);
void view_save_buffer(struct sway_view *view);
#endif