Merge pull request #286 from mikkeloscar/wlc-origin-point

Use wlc_point instead of deprecated wlc_origin
This commit is contained in:
Drew DeVault 2015-12-01 15:17:07 -05:00
commit ef9258bd66

View file

@ -82,7 +82,7 @@ static void handle_output_pre_render(wlc_handle output) {
break; break;
} }
} }
for (i = 0; i < desktop_shell.panels->length; ++i) { for (i = 0; i < desktop_shell.panels->length; ++i) {
struct panel_config *config = desktop_shell.panels->items[i]; struct panel_config *config = desktop_shell.panels->items[i];
if (config->output == output) { if (config->output == output) {
@ -92,16 +92,16 @@ static void handle_output_pre_render(wlc_handle output) {
}; };
switch (desktop_shell.panel_position) { switch (desktop_shell.panel_position) {
case DESKTOP_SHELL_PANEL_POSITION_TOP: case DESKTOP_SHELL_PANEL_POSITION_TOP:
geo.origin = (struct wlc_origin){ 0, 0 }; geo.origin = (struct wlc_point){ 0, 0 };
break; break;
case DESKTOP_SHELL_PANEL_POSITION_BOTTOM: case DESKTOP_SHELL_PANEL_POSITION_BOTTOM:
geo.origin = (struct wlc_origin){ 0, resolution.h - size.h }; geo.origin = (struct wlc_point){ 0, resolution.h - size.h };
break; break;
case DESKTOP_SHELL_PANEL_POSITION_LEFT: case DESKTOP_SHELL_PANEL_POSITION_LEFT:
geo.origin = (struct wlc_origin){ 0, 0 }; geo.origin = (struct wlc_point){ 0, 0 };
break; break;
case DESKTOP_SHELL_PANEL_POSITION_RIGHT: case DESKTOP_SHELL_PANEL_POSITION_RIGHT:
geo.origin = (struct wlc_origin){ resolution.w - size.w, 0 }; geo.origin = (struct wlc_point){ resolution.w - size.w, 0 };
break; break;
} }
wlc_surface_render(config->surface, &geo); wlc_surface_render(config->surface, &geo);