Merge pull request #5445 from akallabeth/some_small_patches

Fix various small issues
This commit is contained in:
David Fort 2019-06-25 11:23:00 +02:00 committed by GitHub
commit ba6d386998
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 4 deletions

View File

@ -434,6 +434,9 @@ DWORD WINAPI mac_client_thread(void* param)
return;
/* send out all accumulated rotations */
if (units > WheelRotationMask)
units = WheelRotationMask;
while (units != 0)
{
/* limit to maximum value in WheelRotationMask (9bit signed value) */

View File

@ -262,7 +262,9 @@ void AppDelegate_EmbedWindowEventHandler(void* ctx, EmbedWindowEventArgs* e)
[[_singleDelegate->window contentView] addSubview:mfc->view];
}
mac_set_view_size(context, mfc->view);
dispatch_async(dispatch_get_main_queue(), ^{
mac_set_view_size(context, mfc->view);
});
}
}
@ -274,7 +276,9 @@ void AppDelegate_ResizeWindowEventHandler(void* ctx, ResizeWindowEventArgs* e)
if (_singleDelegate)
{
mfContext* mfc = (mfContext*) context;
mac_set_view_size(context, mfc->view);
dispatch_async(dispatch_get_main_queue(), ^{
mac_set_view_size(context, mfc->view);
});
}
}

View File

@ -564,7 +564,7 @@ static void dump_window_state_order(wLog *log, const char *msg, const WINDOW_ORD
DUMP_APPEND(buffer, bufferSize, " resizeMarginTop=%"PRIu32" resizeMarginBottom=%"PRIu32"",
state->resizeMarginTop, state->resizeMarginBottom);
if (order->fieldFlags & WINDOW_ORDER_FIELD_RP_CONTENT)
DUMP_APPEND(buffer, bufferSize, " rpContent=0x%"PRIx8"", state->RPContent);
DUMP_APPEND(buffer, bufferSize, " rpContent=0x%"PRIx32"", state->RPContent);
if (order->fieldFlags & WINDOW_ORDER_FIELD_ROOT_PARENT)
DUMP_APPEND(buffer, bufferSize, " rootParent=0x%"PRIx32"", state->rootParentHandle);
if (order->fieldFlags & WINDOW_ORDER_FIELD_WND_OFFSET)

View File

@ -418,7 +418,7 @@ static BOOL process_file_name(const char* local_name, wArrayList* files)
static BOOL process_uri(const char* uri, size_t uri_len, wArrayList* files)
{
const char* prefix = "file://";
const char prefix []= "file://";
BOOL result = FALSE;
char* name = NULL;
const size_t prefixLen = strnlen(prefix, sizeof(prefix));