diff options
-rw-r--r-- | intern/ghost/intern/GHOST_SystemCocoa.mm | 9 | ||||
-rw-r--r-- | source/blender/editors/interface/interface_icons_event.c | 9 | ||||
-rw-r--r-- | source/blender/editors/space_console/console_draw.c | 10 | ||||
-rw-r--r-- | source/blender/editors/space_file/filelist.c | 5 | ||||
-rw-r--r-- | source/blender/editors/space_info/info_draw.c | 10 | ||||
-rw-r--r-- | source/blender/editors/space_info/textview.c | 1 |
6 files changed, 21 insertions, 23 deletions
diff --git a/intern/ghost/intern/GHOST_SystemCocoa.mm b/intern/ghost/intern/GHOST_SystemCocoa.mm index b0e11bd4a96..297b73f8b14 100644 --- a/intern/ghost/intern/GHOST_SystemCocoa.mm +++ b/intern/ghost/intern/GHOST_SystemCocoa.mm @@ -1730,13 +1730,8 @@ GHOST_TSuccess GHOST_SystemCocoa::handleMouseEvent(void *eventPtr) NSPoint mousePos = [cocoawindow mouseLocationOutsideOfEventStream]; GHOST_TInt32 x, y; window->clientToScreenIntern(mousePos.x, mousePos.y, x, y); - pushEvent(new GHOST_EventTrackpad([event timestamp] * 1000, - window, - GHOST_kTrackpadEventSmartMagnify, - x, - y, - 0, - 0)); + pushEvent(new GHOST_EventTrackpad( + [event timestamp] * 1000, window, GHOST_kTrackpadEventSmartMagnify, x, y, 0, 0)); } break; case NSEventTypeRotate: { diff --git a/source/blender/editors/interface/interface_icons_event.c b/source/blender/editors/interface/interface_icons_event.c index 3cc7aaddf38..9a967c3b8f3 100644 --- a/source/blender/editors/interface/interface_icons_event.c +++ b/source/blender/editors/interface/interface_icons_event.c @@ -74,8 +74,10 @@ #include "interface_intern.h" -static void icon_draw_rect_input_text( - const rctf *rect, const float color[4], const char *str, int font_size) +static void icon_draw_rect_input_text(const rctf *rect, + const float color[4], + const char *str, + int font_size) { BLF_batch_draw_flush(); const int font_id = BLF_default(); @@ -206,8 +208,7 @@ void icon_draw_rect_input(float x, icon_draw_rect_input_text(&rect, color, (const char[]){'P', 0xe2, 0x86, 0x91, 0x0}, 8); } else if (event_type == PAGEDOWNKEY) { - icon_draw_rect_input_text( - &rect, color, (const char[]){'P', 0xe2, 0x86, 0x93, 0x0}, 8); + icon_draw_rect_input_text(&rect, color, (const char[]){'P', 0xe2, 0x86, 0x93, 0x0}, 8); } else if (event_type == LEFTARROWKEY) { icon_draw_rect_input_symbol(&rect, color, (const char[]){0xe2, 0x86, 0x90, 0x0}); diff --git a/source/blender/editors/space_console/console_draw.c b/source/blender/editors/space_console/console_draw.c index c9dde11cbeb..ac54b1177ba 100644 --- a/source/blender/editors/space_console/console_draw.c +++ b/source/blender/editors/space_console/console_draw.c @@ -43,11 +43,11 @@ #include "../space_info/textview.h" static int console_line_data(struct TextViewContext *tvc, - unsigned char fg[4], - unsigned char UNUSED(bg[4]), - int *UNUSED(icon), - unsigned char UNUSED(icon_fg[4]), - unsigned char UNUSED(icon_bg[4])) + unsigned char fg[4], + unsigned char UNUSED(bg[4]), + int *UNUSED(icon), + unsigned char UNUSED(icon_fg[4]), + unsigned char UNUSED(icon_bg[4])) { ConsoleLine *cl_iter = (ConsoleLine *)tvc->iter; int fg_id = TH_TEXT; diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index fa904e0934b..800726c6fb0 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -947,7 +947,10 @@ ImBuf *filelist_geticon_image(struct FileList *filelist, const int index) return filelist_geticon_image_ex(file->typeflag, file->relpath); } -static int filelist_geticon_ex(FileDirEntry *file, const char *root, const bool is_main, const bool ignore_libdir) +static int filelist_geticon_ex(FileDirEntry *file, + const char *root, + const bool is_main, + const bool ignore_libdir) { const int typeflag = file->typeflag; diff --git a/source/blender/editors/space_info/info_draw.c b/source/blender/editors/space_info/info_draw.c index d86e0e2af97..03ff680a93d 100644 --- a/source/blender/editors/space_info/info_draw.c +++ b/source/blender/editors/space_info/info_draw.c @@ -43,11 +43,11 @@ #include "GPU_framebuffer.h" static int report_line_data(struct TextViewContext *tvc, - unsigned char fg[4], - unsigned char bg[4], - int *icon, - unsigned char icon_fg[4], - unsigned char icon_bg[4]) + unsigned char fg[4], + unsigned char bg[4], + int *icon, + unsigned char icon_fg[4], + unsigned char icon_bg[4]) { Report *report = (Report *)tvc->iter; diff --git a/source/blender/editors/space_info/textview.c b/source/blender/editors/space_info/textview.c index 9828034aaac..c145f5d333f 100644 --- a/source/blender/editors/space_info/textview.c +++ b/source/blender/editors/space_info/textview.c @@ -160,7 +160,6 @@ static bool console_draw_string(TextViewDrawState *tds, &tot_lines, &offsets); - int line_height = (tot_lines * tds->lheight) + (tds->row_vpadding * 2); int line_bottom = tds->xy[1]; int line_top = line_bottom + line_height; |