[Bf-blender-cvs] [dd16d498d4a] fixed_width_integers: Cleanup formatting.
Nicholas Rishel
noreply at git.blender.org
Mon Jul 5 19:18:23 CEST 2021
Commit: dd16d498d4a13533ea3aeb6bc081f68386fe4670
Author: Nicholas Rishel
Date: Mon Jul 5 00:10:42 2021 -0700
Branches: fixed_width_integers
https://developer.blender.org/rBdd16d498d4a13533ea3aeb6bc081f68386fe4670
Cleanup formatting.
===================================================================
M intern/ghost/GHOST_C-api.h
M intern/ghost/GHOST_IWindow.h
M intern/ghost/GHOST_Rect.h
M intern/ghost/intern/GHOST_C-api.cpp
M intern/ghost/intern/GHOST_DisplayManager.cpp
M intern/ghost/intern/GHOST_DisplayManager.h
M intern/ghost/intern/GHOST_DisplayManagerCocoa.h
M intern/ghost/intern/GHOST_DisplayManagerSDL.h
M intern/ghost/intern/GHOST_DisplayManagerWin32.h
M intern/ghost/intern/GHOST_DisplayManagerX11.h
M intern/ghost/intern/GHOST_EventKey.h
M intern/ghost/intern/GHOST_SystemCocoa.mm
M intern/ghost/intern/GHOST_SystemWayland.cpp
M intern/ghost/intern/GHOST_SystemX11.cpp
M intern/ghost/intern/GHOST_Window.cpp
M intern/ghost/intern/GHOST_Window.h
M intern/ghost/intern/GHOST_WindowCocoa.h
M intern/ghost/intern/GHOST_WindowCocoa.mm
M intern/ghost/intern/GHOST_WindowNULL.h
M intern/ghost/intern/GHOST_WindowSDL.cpp
M intern/ghost/intern/GHOST_WindowSDL.h
M intern/ghost/intern/GHOST_WindowWayland.cpp
M intern/ghost/intern/GHOST_WindowWayland.h
M intern/ghost/intern/GHOST_WindowWin32.cpp
M intern/ghost/intern/GHOST_WindowWin32.h
M intern/ghost/intern/GHOST_WindowX11.cpp
M intern/ghost/intern/GHOST_WindowX11.h
===================================================================
diff --git a/intern/ghost/GHOST_C-api.h b/intern/ghost/GHOST_C-api.h
index fd5ddebac6c..0feb6f4c6cb 100644
--- a/intern/ghost/GHOST_C-api.h
+++ b/intern/ghost/GHOST_C-api.h
@@ -624,11 +624,8 @@ extern GHOST_TSuccess GHOST_SetClientSize(GHOST_WindowHandle windowhandle,
* \param outX: The x-coordinate in the client rectangle.
* \param outY: The y-coordinate in the client rectangle.
*/
-extern void GHOST_ScreenToClient(GHOST_WindowHandle windowhandle,
- int32_t inX,
- int32_t inY,
- int32_t *outX,
- int32_t *outY);
+extern void GHOST_ScreenToClient(
+ GHOST_WindowHandle windowhandle, int32_t inX, int32_t inY, int32_t *outX, int32_t *outY);
/**
* Converts a point in screen coordinates to client rectangle coordinates
@@ -638,11 +635,8 @@ extern void GHOST_ScreenToClient(GHOST_WindowHandle windowhandle,
* \param outX: The x-coordinate on the screen.
* \param outY: The y-coordinate on the screen.
*/
-extern void GHOST_ClientToScreen(GHOST_WindowHandle windowhandle,
- int32_t inX,
- int32_t inY,
- int32_t *outX,
- int32_t *outY);
+extern void GHOST_ClientToScreen(
+ GHOST_WindowHandle windowhandle, int32_t inX, int32_t inY, int32_t *outX, int32_t *outY);
/**
* Returns the state of the window (normal, minimized, maximized).
@@ -775,11 +769,8 @@ extern int32_t GHOST_GetHeightRectangle(GHOST_RectangleHandle rectanglehandle);
* \param r: Pointer to return right coordinate in.
* \param b: Pointer to return bottom coordinate in.
*/
-extern void GHOST_GetRectangle(GHOST_RectangleHandle rectanglehandle,
- int32_t *l,
- int32_t *t,
- int32_t *r,
- int32_t *b);
+extern void GHOST_GetRectangle(
+ GHOST_RectangleHandle rectanglehandle, int32_t *l, int32_t *t, int32_t *r, int32_t *b);
/**
* Sets all members of the rectangle.
@@ -789,11 +780,8 @@ extern void GHOST_GetRectangle(GHOST_RectangleHandle rectanglehandle,
* \param r: requested right coordinate of the rectangle.
* \param b: requested bottom coordinate of the rectangle.
*/
-extern void GHOST_SetRectangle(GHOST_RectangleHandle rectanglehandle,
- int32_t l,
- int32_t t,
- int32_t r,
- int32_t b);
+extern void GHOST_SetRectangle(
+ GHOST_RectangleHandle rectanglehandle, int32_t l, int32_t t, int32_t r, int32_t b);
/**
* Returns whether this rectangle is empty.
@@ -835,9 +823,7 @@ extern void GHOST_UnionRectangle(GHOST_RectangleHandle rectanglehandle,
* \param x: The x-coordinate of the point.
* \param y: The y-coordinate of the point.
*/
-extern void GHOST_UnionPointRectangle(GHOST_RectangleHandle rectanglehandle,
- int32_t x,
- int32_t y);
+extern void GHOST_UnionPointRectangle(GHOST_RectangleHandle rectanglehandle, int32_t x, int32_t y);
/**
* Returns whether the point is inside this rectangle.
@@ -881,11 +867,8 @@ extern void GHOST_SetCenterRectangle(GHOST_RectangleHandle rectanglehandle,
* \param w: requested width of the rectangle.
* \param h: requested height of the rectangle.
*/
-extern void GHOST_SetRectangleCenter(GHOST_RectangleHandle rectanglehandle,
- int32_t cx,
- int32_t cy,
- int32_t w,
- int32_t h);
+extern void GHOST_SetRectangleCenter(
+ GHOST_RectangleHandle rectanglehandle, int32_t cx, int32_t cy, int32_t w, int32_t h);
/**
* Clips a rectangle.
@@ -956,12 +939,8 @@ extern uint16_t GHOST_GetDPIHint(GHOST_WindowHandle windowhandle);
* - true: Start a new composition.
* - false: Move the IME windows to the given position without finishing it.
*/
-extern void GHOST_BeginIME(GHOST_WindowHandle windowhandle,
- int32_t x,
- int32_t y,
- int32_t w,
- int32_t h,
- bool complete);
+extern void GHOST_BeginIME(
+ GHOST_WindowHandle windowhandle, int32_t x, int32_t y, int32_t w, int32_t h, bool complete);
/**
* Disable the IME attached to the given window, i.e. prohibits any user-input
* events from being dispatched to the IME.
diff --git a/intern/ghost/GHOST_IWindow.h b/intern/ghost/GHOST_IWindow.h
index 64dc81b6afb..f870791b345 100644
--- a/intern/ghost/GHOST_IWindow.h
+++ b/intern/ghost/GHOST_IWindow.h
@@ -130,10 +130,7 @@ class GHOST_IWindow {
* \param outX: The x-coordinate in the client rectangle.
* \param outY: The y-coordinate in the client rectangle.
*/
- virtual void screenToClient(int32_t inX,
- int32_t inY,
- int32_t &outX,
- int32_t &outY) const = 0;
+ virtual void screenToClient(int32_t inX, int32_t inY, int32_t &outX, int32_t &outY) const = 0;
/**
* Converts a point in screen coordinates to client rectangle coordinates
@@ -142,10 +139,7 @@ class GHOST_IWindow {
* \param outX: The x-coordinate on the screen.
* \param outY: The y-coordinate on the screen.
*/
- virtual void clientToScreen(int32_t inX,
- int32_t inY,
- int32_t &outX,
- int32_t &outY) const = 0;
+ virtual void clientToScreen(int32_t inX, int32_t inY, int32_t &outX, int32_t &outY) const = 0;
/**
* Tells if the ongoing drag'n'drop object can be accepted upon mouse drop
@@ -348,8 +342,7 @@ class GHOST_IWindow {
* - true: Start a new composition
* - false: Move the IME windows to the given position without finishing it.
*/
- virtual void beginIME(
- int32_t x, int32_t y, int32_t w, int32_t h, bool completed) = 0;
+ virtual void beginIME(int32_t x, int32_t y, int32_t w, int32_t h, bool completed) = 0;
/**
* Disable the IME attached to the given window, i.e. prohibits any user-input
diff --git a/intern/ghost/GHOST_Rect.h b/intern/ghost/GHOST_Rect.h
index d00bee83857..1c67ca3d2e0 100644
--- a/intern/ghost/GHOST_Rect.h
+++ b/intern/ghost/GHOST_Rect.h
@@ -116,10 +116,7 @@ class GHOST_Rect {
* \param x: The x-coordinate of the point.
* \param y: The y-coordinate of the point.
*/
- virtual inline void wrapPoint(int32_t &x,
- int32_t &y,
- int32_t ofs,
- GHOST_TAxisFlag axis);
+ virtual inline void wrapPoint(int32_t &x, int32_t &y, int32_t ofs, GHOST_TAxisFlag axis);
/**
* Returns whether the point is inside this rectangle.
@@ -231,10 +228,7 @@ inline void GHOST_Rect::unionPoint(int32_t x, int32_t y)
m_b = y;
}
-inline void GHOST_Rect::wrapPoint(int32_t &x,
- int32_t &y,
- int32_t ofs,
- GHOST_TAxisFlag axis)
+inline void GHOST_Rect::wrapPoint(int32_t &x, int32_t &y, int32_t ofs, GHOST_TAxisFlag axis)
{
int32_t w = getWidth();
int32_t h = getHeight();
diff --git a/intern/ghost/intern/GHOST_C-api.cpp b/intern/ghost/intern/GHOST_C-api.cpp
index 7d273d3409a..daa228ccef6 100644
--- a/intern/ghost/intern/GHOST_C-api.cpp
+++ b/intern/ghost/intern/GHOST_C-api.cpp
@@ -344,18 +344,14 @@ GHOST_TSuccess GHOST_SetCursorVisibility(GHOST_WindowHandle windowhandle, int vi
return window->setCursorVisibility(visible ? true : false);
}
-GHOST_TSuccess GHOST_GetCursorPosition(GHOST_SystemHandle systemhandle,
- int32_t *x,
- int32_t *y)
+GHOST_TSuccess GHOST_GetCursorPosition(GHOST_SystemHandle systemhandle, int32_t *x, int32_t *y)
{
GHOST_ISystem *system = (GHOST_ISystem *)systemhandle;
return system->getCursorPosition(*x, *y);
}
-GHOST_TSuccess GHOST_SetCursorPosition(GHOST_SystemHandle systemhandle,
- int32_t x,
- int32_t y)
+GHOST_TSuccess GHOST_SetCursorPosition(GHOST_SystemHandle systemhandle, int32_t x, int32_t y)
{
GHOST_ISystem *system = (GHOST_ISystem *)systemhandle;
@@ -578,22 +574,16 @@ GHOST_TSuccess GHOST_SetClientSize(GHOST_WindowHandle windowhandle,
return window->setClientSize(width, height);
}
-void GHOST_ScreenToClient(GHOST_WindowHandle windowhandle,
- int32_t inX,
- int32_t inY,
- int32_t *outX,
- int32_t *outY)
+void GHOST_ScreenToClient(
+ GHOST_WindowHandle windowhandle, int32_t inX, int32_t inY, int32_t *outX, int32_t *outY)
{
GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
window->screenToClient(inX, inY, *outX, *outY);
}
-void GHOST_ClientToScreen(GHOST_WindowHandle windowhandle,
- int32_t inX,
- int32_t inY,
- int32_t *outX,
- int32_t *outY)
+void GHOST_ClientToScreen(
+ GHOST_WindowHandle windowhandle, int32_t inX, int32_t inY, int32_t *outX, int32_t *outY)
{
GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
@@ -614,8 +604,7 @@ GHOST_TSuccess GHOST_SetWindowState(GHOST_WindowHandle windowhandle, GHOST_TWind
return window->setState(state);
}
-GHOST_TSuccess GHOST_SetWindowModifiedState(GHOST_WindowHandle windowhandle,
- bool isUnsavedChanges)
+GHOST_TSuccess GHOST_SetWindowModifiedState(GHOST_WindowHandle windowhandle, bool isUnsavedChanges)
{
GHOST_IWindow *window = (GHOST_IWindow *)windowhandle;
@@ -713,11 +702,8 @@ int32_t GHOST_GetHeightRectangle(GHOST_RectangleHandle rectanglehandle)
return ((GHOST_Rect *)rectanglehandle)->getHeight();
}
-void GHOST_GetRectangle(GHO
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list