diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-11-10 08:21:50 -0500 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2017-11-10 08:21:50 -0500 |
| commit | 425713b83730a7b707ac5b0a325b8e37464a982c (patch) | |
| tree | ef504e85918a36d1abc4e9b659abf000d453a164 /include/rootston | |
| parent | ca3c373c18fa2c4edb2e3f46c74d50f1f571e72c (diff) | |
| parent | aafb00a15fd84b6d40f2efa52333eea5633b14e5 (diff) | |
Merge branch 'hidpi'
Diffstat (limited to 'include/rootston')
| -rw-r--r-- | include/rootston/config.h | 1 | ||||
| -rw-r--r-- | include/rootston/view.h | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/include/rootston/config.h b/include/rootston/config.h index 75c04619..e0466117 100644 --- a/include/rootston/config.h +++ b/include/rootston/config.h @@ -8,6 +8,7 @@ struct output_config { char *name; enum wl_output_transform transform; int x, y; + int scale; struct wl_list link; struct { int width, height; diff --git a/include/rootston/view.h b/include/rootston/view.h index 0913b42e..8a289355 100644 --- a/include/rootston/view.h +++ b/include/rootston/view.h @@ -71,7 +71,7 @@ struct roots_view { // configure event from the xdg_shell // If not then this should follow the typical type/impl pattern we use // elsewhere - void (*get_size)(struct roots_view *view, struct wlr_box *box); + void (*get_size)(const struct roots_view *view, struct wlr_box *box); void (*activate)(struct roots_view *view, bool active); void (*move)(struct roots_view *view, double x, double y); void (*resize)(struct roots_view *view, uint32_t width, uint32_t height); @@ -80,7 +80,7 @@ struct roots_view { void (*close)(struct roots_view *view); }; -void view_get_size(struct roots_view *view, struct wlr_box *box); +void view_get_size(const struct roots_view *view, struct wlr_box *box); void view_activate(struct roots_view *view, bool active); void view_move(struct roots_view *view, double x, double y); void view_resize(struct roots_view *view, uint32_t width, uint32_t height); |