~ruther/CTU-FEE-B0B35APO-Semestral-project

9b4e7b7ed7be2596eabe16b58ebb0a0f29256075 — František Boháček 4 years ago 9e564f0
fix: text movement
M text-viewer/include/gui_component_text_view.h => text-viewer/include/gui_component_text_view.h +1 -1
@@ 21,7 21,7 @@ multiline_text_t *gui_multiline_text_create(font_t *font, display_pixel_t color,

component_t gui_text_view_create(gui_t *gui, multiline_text_t *text, int16_t x, int16_t y);

void gui_text_view_scroll(component_t *text_view, int16_t x, int16_t y);
void gui_text_view_scroll(component_t *text_view, int32_t x, int32_t y);
void gui_text_view_reset_scroll(component_t *text_view);
void gui_text_view_full_scroll(component_t *text_view);


M text-viewer/src/gui_component_text_view.c => text-viewer/src/gui_component_text_view.c +1 -1
@@ 66,7 66,7 @@ multiline_text_t *gui_multiline_text_create(font_t *font, display_pixel_t color,
  return multiline_text;
}

void gui_text_view_scroll(component_t *text_view, int16_t x, int16_t y) {
void gui_text_view_scroll(component_t *text_view, int32_t x, int32_t y) {
  text_view->x -= x;
  text_view->y -= y;
}

M text-viewer/src/text_viewer.c => text-viewer/src/text_viewer.c +3 -2
@@ 138,8 138,9 @@ static component_t *text_viewer_gui_add_text_view(text_viewer_t *text_viewer, co
static void command_handler_move(void *state, direction_t direction, int amount) {
  component_t *text_view = (component_t*)state;
  if (text_view->focused) {
    int32_t x, y;
    direction_move_xy(direction, (int32_t*)&x, (int32_t*)&y, amount);
    int32_t x = 0;
    int32_t y = 0;
    direction_move_xy(direction, &x, &y, amount);
    gui_text_view_scroll(text_view, x, y);
  }
}