Commit c35f46d03c23c1026bd4363cf20a65300fc7e05b
2017-03-18T13:57:57
mir: Set the max/min w/h vs just setting the window w/h
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67
diff --git a/src/video/mir/SDL_mirwindow.c b/src/video/mir/SDL_mirwindow.c
index b4eb74d..62cdbd7 100644
--- a/src/video/mir/SDL_mirwindow.c
+++ b/src/video/mir/SDL_mirwindow.c
@@ -249,35 +249,49 @@ MIR_HideWindow(_THIS, SDL_Window* window)
UpdateMirWindowState(_this->driverdata, window->driverdata, mir_window_state_hidden);
}
-static void
-UpdateMirWindowSize(MIR_Data* mir_data, MIR_Window* mir_window, int width, int height)
+void
+MIR_SetWindowSize(_THIS, SDL_Window* window)
{
+ MIR_Data* mir_data = _this->driverdata;
+ MIR_Window* mir_window = window->driverdata;
+
if (IsMirWindowValid(mir_window)) {
MirWindowSpec* spec = MIR_mir_create_window_spec(mir_data->connection);
- MIR_mir_window_spec_set_width (spec, width);
- MIR_mir_window_spec_set_height(spec, height);
+ MIR_mir_window_spec_set_width (spec, window->w);
+ MIR_mir_window_spec_set_height(spec, window->h);
MIR_mir_window_apply_spec(mir_window->window, spec);
- MIR_mir_window_spec_release(spec);
}
}
void
-MIR_SetWindowSize(_THIS, SDL_Window* window)
-{
- UpdateMirWindowSize(_this->driverdata, window->driverdata, window->w, window->h);
-}
-
-void
MIR_SetWindowMinimumSize(_THIS, SDL_Window* window)
{
- UpdateMirWindowSize(_this->driverdata, window->driverdata, window->min_w, window->min_h);
+ MIR_Data* mir_data = _this->driverdata;
+ MIR_Window* mir_window = window->driverdata;
+
+ if (IsMirWindowValid(mir_window)) {
+ MirWindowSpec* spec = MIR_mir_create_window_spec(mir_data->connection);
+ MIR_mir_window_spec_set_min_width (spec, window->min_w);
+ MIR_mir_window_spec_set_min_height(spec, window->min_h);
+
+ MIR_mir_window_apply_spec(mir_window->window, spec);
+ }
}
void
MIR_SetWindowMaximumSize(_THIS, SDL_Window* window)
{
- UpdateMirWindowSize(_this->driverdata, window->driverdata, window->max_w, window->max_h);
+ MIR_Data* mir_data = _this->driverdata;
+ MIR_Window* mir_window = window->driverdata;
+
+ if (IsMirWindowValid(mir_window)) {
+ MirWindowSpec* spec = MIR_mir_create_window_spec(mir_data->connection);
+ MIR_mir_window_spec_set_max_width (spec, window->max_w);
+ MIR_mir_window_spec_set_max_height(spec, window->max_h);
+
+ MIR_mir_window_apply_spec(mir_window->window, spec);
+ }
}
void