Macintosh-SW
/
MessagesForMacintosh
mirror of https://github.com/CamHenlin/MessagesForMacintosh.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

small bug fixes, including preventing unnecessary chat list redraws, fixing cursor hover, flagging more of the command caching features which will need more work to work properly. cut new release candidate

This commit is contained in:
camh 2022-02-19 23:12:28 -08:00
parent 0c16aa46ba
commit fbc7e3a1ec
7 changed files with 37 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
coprocessorjs.c
View File

@ -512,7 +512,7 @@ char* _getReturnValueFromResponse(char* response, char* application_id, char* ca
// char x[2555];
// sprintf(x, "%s: %d (%.*s)", token, lengthWithoutControlChars, lengthWithoutControlChars, token);
// writeSerialPortDebug(boutRefNum, x);
// this seems to be the location where we can sometimes mangle our response data
sprintf(output, "%.*s", lengthWithoutControlChars, token); // drop the ;;@@&& off the end of the response
#ifdef DEBUGGING

BIN
dist/MessagesForMacintosh.dsk vendored
View File

Binary file not shown.

BIN
dist/MessagesForMacintosh.zip vendored
View File

Binary file not shown.

4
mac_main.c
View File

@ -326,8 +326,6 @@ void EventLoop(struct nk_context *ctx)
PROFILE_START("nuklearApp");
#endif
firstOrMouseMove = false;
#ifdef MAC_APP_DEBUGGING
writeSerialPortDebug(boutRefNum, "nuklearApp");
@ -335,6 +333,8 @@ void EventLoop(struct nk_context *ctx)
nuklearApp(ctx);
firstOrMouseMove = false;
#ifdef PROFILING
PROFILE_END("nuklearApp");
PROFILE_START("nk_quickdraw_render");

47
nuklear.h
View File

@ -17002,19 +17002,21 @@ nk_do_edit(nk_flags *state, struct nk_command_buffer *out,
Pattern sel_background_color;
int sel_text_color;
Pattern cursor_color;
int cursor_text_color;
// int cursor_text_color;
Pattern *background;
clip.w = area.w;
nk_push_scissor(out, clip);
// this is meant to fix text boxes when scrolling to the right when typing long text
struct nk_rect whiteTextarea;
whiteTextarea.x = clip.x + line_width - edit->scrollbar.x;
whiteTextarea.y = clip.y;
whiteTextarea.h = clip.h;
whiteTextarea.w = line_width - (line_width - edit->scrollbar.x) - 1;
nk_fill_rect(out, whiteTextarea, style->rounding, qd.black, false);
#ifdef COMMAND_CACHING
struct nk_rect whiteTextarea;
whiteTextarea.x = clip.x + line_width - edit->scrollbar.x;
whiteTextarea.y = clip.y;
whiteTextarea.h = clip.h;
whiteTextarea.w = line_width - (line_width - edit->scrollbar.x) - 1;
nk_fill_rect(out, whiteTextarea, style->rounding, qd.black, false);
#endif
/* select correct colors to draw */
if (*state & NK_WIDGET_STATE_ACTIVED) {
@ -17023,13 +17025,13 @@ nk_do_edit(nk_flags *state, struct nk_command_buffer *out,
sel_text_color = style->selected_text_hover;
sel_background_color = style->selected_hover;
cursor_color = style->cursor_hover;
cursor_text_color = style->cursor_text_hover;
// cursor_text_color = style->cursor_text_hover;
} else if (*state & NK_WIDGET_STATE_HOVER) {
background = &style->hover;
text_color = style->text_hover;
sel_text_color = style->selected_text_hover;
sel_background_color = style->selected_hover;
cursor_text_color = style->cursor_text_hover;
// cursor_text_color = style->cursor_text_hover;
cursor_color = style->cursor_hover;
} else {
background = &style->normal;
@ -17037,7 +17039,7 @@ nk_do_edit(nk_flags *state, struct nk_command_buffer *out,
sel_text_color = style->selected_text_normal;
sel_background_color = style->selected_normal;
cursor_color = style->cursor_normal;
cursor_text_color = style->cursor_text_normal;
// cursor_text_color = style->cursor_text_normal;
}
background_color = *background;
@ -17102,37 +17104,39 @@ nk_do_edit(nk_flags *state, struct nk_command_buffer *out,
if (edit->cursor >= nk_str_len(&edit->string) || (cursor_ptr && *cursor_ptr == '\n')) {
/* draw cursor at end of line */
struct nk_rect cursor;
cursor.w = style->cursor_size;
cursor.w = 1; // style->cursor_size;
cursor.h = font->height;
cursor.x = area.x + cursor_pos.x - edit->scrollbar.x;
cursor.y = area.y + cursor_pos.y + row_height/2 - cursor.h/2;
cursor.y -= edit->scrollbar.y;
nk_fill_rect(out, cursor, 0, cursor_color, true);
#ifdef COMMAND_CACHING
struct nk_rect whiteTextarea2;
whiteTextarea2.x = cursor.x + cursor.w;
whiteTextarea2.y = cursor.y - 2;
whiteTextarea2.h = cursor.h + 6;
whiteTextarea2.w = 9; //cursor.w * 2; // this was previously used when cursor.w = 4, doesn't work well at = 1
nk_fill_rect(out, whiteTextarea2, 0, qd.black, false);
#endif
} else {
/* draw cursor inside text */
short glyph_len;
// short glyph_len;
struct nk_rect label;
struct nk_text txt;
// struct nk_text txt;
nk_rune unicode;
// nk_rune unicode;
// NK_ASSERT(cursor_ptr);
glyph_len = nk_utf_decode(cursor_ptr, &unicode, 4);
// glyph_len = nk_utf_decode(cursor_ptr, &unicode, 4);
label.x = area.x + cursor_pos.x - edit->scrollbar.x;
label.y = area.y + cursor_pos.y - edit->scrollbar.y;
label.w = font->width(font->userdata, font->height, cursor_ptr, glyph_len);
label.w = 1; // font->width(font->userdata, font->height, cursor_ptr, glyph_len);
label.h = row_height;
txt.padding = nk_vec2(0,0);
txt.background = cursor_color;
txt.text = cursor_text_color;
// txt.padding = nk_vec2(0,0);
// txt.background = cursor_color;
// txt.text = cursor_text_color;
nk_fill_rect(out, label, 0, cursor_color, true);
// struct nk_rect whiteTextarea2;
@ -17142,7 +17146,7 @@ nk_do_edit(nk_flags *state, struct nk_command_buffer *out,
// whiteTextarea2.w = label.w;
// nk_fill_rect(out, whiteTextarea2, 0, qd.black, false);
nk_widget_text(out, label, cursor_ptr, glyph_len, &txt, NK_TEXT_LEFT, font, false);
// nk_widget_text(out, label, cursor_ptr, glyph_len, &txt, NK_TEXT_LEFT, font, false);
}
}}
} else {
@ -17168,13 +17172,14 @@ nk_do_edit(nk_flags *state, struct nk_command_buffer *out,
// background_color = whiteColor;
// else
// background_color = background;
#ifdef COMMAND_CACHING
struct nk_rect whiteTextarea;
whiteTextarea.x = area.x;
whiteTextarea.y = area.y;
whiteTextarea.h = area.h;
whiteTextarea.w = area.w;
nk_fill_rect(out, whiteTextarea, 0, qd.black, false);
#endif
nk_edit_draw_text(out, style, area.x - edit->scrollbar.x, area.y - edit->scrollbar.y, 0, begin, l, row_height, font, style->normal, style->text_normal, nk_false, true);
}

3
nuklear_app.c
View File

@ -583,7 +583,7 @@ static void nuklearApp(struct nk_context *ctx) {
// we force a redraw for several following iterations in case the mouse has moved away,
// we want to ensure that the button highlighting disappears
if (chatWindowCollision) {
if (chatWindowCollision && firstOrMouseMove) {
forceRedrawChats = 3;
}
@ -639,6 +639,7 @@ static void nuklearApp(struct nk_context *ctx) {
sprintf(activeChat, "%.63s", chatFriendlyNames[i]);
}
forceRedrawChats = 6; // redraw the chat list for several iterations in an attempt to get rid of the hovered button
getMessages(activeChat, 0);
}
}

6
nuklear_quickdraw.h
View File

@ -27,6 +27,7 @@
#define ENABLED_DOUBLE_BUFFERING
// #define COMMAND_CACHING
// #define NK_QUICKDRAW_GRAPHICS_DEBUGGING
// #define DRAW_BLIT_LOCATION
Boolean lastInputWasBackspace;
@ -1187,6 +1188,11 @@ NK_API void nk_quickdraw_render(WindowPtr window, struct nk_context *ctx) {
CopyBits(&gMainOffScreen.bits->portBits, &window->portBits, &quickDrawRectangle, &quickDrawRectangle, srcCopy, 0L);
#ifdef DRAW_BLIT_LOCATION
ForeColor(blackColor);
FrameRoundRect(&quickDrawRectangle, 0, 0);
#endif
mostLeft = WINDOW_WIDTH;
mostBottom = 1;
mostTop = WINDOW_HEIGHT;