KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix the in cell offset calculations

Browse Source
This commit is contained in:
Kovid Goyal 2018-01-10 13:48:01 +05:30
parent 677e8a1ae9
commit 025a46bb35
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
kitty/icat.py
View File

@ -140,6 +140,15 @@ def fit_image(width, height, pwidth, pheight):
return int(width), int(height) return int(width), int(height)
def calculate_in_cell_x_offset(width, cell_width, align):
if align == 'left':
return 0
extra_pixels = cell_width - (width % cell_width)
if align == 'right':
return extra_pixels
return extra_pixels // 2
def set_cursor(cmd, width, height, align): def set_cursor(cmd, width, height, align):
ss = screen_size() ss = screen_size()
cw = int(ss.width / ss.cols) cw = int(ss.width / ss.cols)
@ -148,12 +157,9 @@ def set_cursor(cmd, width, height, align):
w, h = fit_image(width, height, ss.width, height) w, h = fit_image(width, height, ss.width, height)
ch = int(ss.height / ss.rows) ch = int(ss.height / ss.rows)
num_of_rows_needed = int(ceil(height / ch)) num_of_rows_needed = int(ceil(height / ch))
y_off = height % ch
cmd['c'], cmd['r'] = ss.cols, num_of_rows_needed cmd['c'], cmd['r'] = ss.cols, num_of_rows_needed
cmd['Y'] = y_off
else: else:
x_off = width % cw cmd['X'] = calculate_in_cell_x_offset(width, cw, align)
cmd['X'] = x_off
extra_cells = 0 extra_cells = 0
if align == 'center': if align == 'center':
extra_cells = (ss.cols - num_of_cells_needed) // 2 extra_cells = (ss.cols - num_of_cells_needed) // 2
@ -168,8 +174,7 @@ def set_cursor_for_place(place, cmd, width, height, align):
ss = screen_size() ss = screen_size()
cw = int(ss.width / ss.cols) cw = int(ss.width / ss.cols)
num_of_cells_needed = int(ceil(width / cw)) num_of_cells_needed = int(ceil(width / cw))
x_off = width % cw cmd['X'] = calculate_in_cell_x_offset(width, cw, align)
cmd['X'] = x_off
extra_cells = 0 extra_cells = 0
if align == 'center': if align == 'center':
extra_cells = (place.width - num_of_cells_needed) // 2 extra_cells = (place.width - num_of_cells_needed) // 2