Merge branch 'blender-v2.81-release'
This commit is contained in:
commit
554321c6fb
@ -31,6 +31,7 @@ struct SpaceFile;
|
||||
struct bContext;
|
||||
struct bScreen;
|
||||
struct uiBlock;
|
||||
struct wmWindow;
|
||||
struct wmWindowManager;
|
||||
|
||||
#define FILE_LAYOUT_HOR 1
|
||||
|
@ -110,8 +110,8 @@ int WM_window_pixels_x(const struct wmWindow *win);
|
||||
int WM_window_pixels_y(const struct wmWindow *win);
|
||||
void WM_window_rect_calc(const struct wmWindow *win, struct rcti *r_rect);
|
||||
void WM_window_screen_rect_calc(const struct wmWindow *win, struct rcti *r_rect);
|
||||
bool WM_window_is_fullscreen(struct wmWindow *win);
|
||||
bool WM_window_is_maximized(struct wmWindow *win);
|
||||
bool WM_window_is_fullscreen(const struct wmWindow *win);
|
||||
bool WM_window_is_maximized(const struct wmWindow *win);
|
||||
|
||||
void WM_windows_scene_data_sync(const ListBase *win_lb, struct Scene *scene) ATTR_NONNULL();
|
||||
struct Scene *WM_windows_scene_get_from_screen(const struct wmWindowManager *wm,
|
||||
@ -165,7 +165,7 @@ struct wmWindow *WM_window_open_temp(struct bContext *C,
|
||||
int sizey,
|
||||
int space_type,
|
||||
bool dialog);
|
||||
void WM_window_set_dpi(wmWindow *win);
|
||||
void WM_window_set_dpi(const wmWindow *win);
|
||||
|
||||
bool WM_stereo3d_enabled(struct wmWindow *win, bool only_fullscreen_test);
|
||||
|
||||
|
@ -494,7 +494,7 @@ void wm_window_title(wmWindowManager *wm, wmWindow *win)
|
||||
}
|
||||
}
|
||||
|
||||
void WM_window_set_dpi(wmWindow *win)
|
||||
void WM_window_set_dpi(const wmWindow *win)
|
||||
{
|
||||
float auto_dpi = GHOST_GetDPIHint(win->ghostwin);
|
||||
|
||||
@ -2186,12 +2186,12 @@ void WM_window_screen_rect_calc(const wmWindow *win, rcti *r_rect)
|
||||
*r_rect = screen_rect;
|
||||
}
|
||||
|
||||
bool WM_window_is_fullscreen(wmWindow *win)
|
||||
bool WM_window_is_fullscreen(const wmWindow *win)
|
||||
{
|
||||
return win->windowstate == GHOST_kWindowStateFullScreen;
|
||||
}
|
||||
|
||||
bool WM_window_is_maximized(wmWindow *win)
|
||||
bool WM_window_is_maximized(const wmWindow *win)
|
||||
{
|
||||
return win->windowstate == GHOST_kWindowStateMaximized;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user