mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-06-12 19:49:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix drag overlay: separate title bar highlight from body hover overlay

Browse Source 
quadrant=5: title bar hover — full window overlay + title bar highlight
quadrant=6: body hover (non-Splits) — full window overlay only
quadrant=1-4: Splits body hover — directional half-window overlay

Previously quadrant=5 was used for all full-window cases, causing
is_drag_target=True to fire on body hover which incorrectly lit up
the title bar highlight whenever hovering any window body.
This commit is contained in:
mcrmck
2026-03-20 01:23:23 -04:00
parent 2bf4da9724
commit 940b8bf1d3
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
kitty/shaders.c
View File

@@ -800,7 +800,8 @@ draw_drag_preview_overlay(const UIRenderData *ui) {
case 2: left = 0.f; break; // right half
case 3: bottom = 0.f; break; // top half
case 4: top = 0.f; break; // bottom half
case 5: break; // full window (swap)
case 5: break; // full window + title bar highlight (title bar hover)
case 6: break; // full window, no title bar highlight (body hover)
default: return;
}
bind_program(TINT_PROGRAM);

31
kitty/tabs.py
View File

@@ -1124,7 +1124,7 @@ class TabBeingDropped(NamedTuple):
class WindowBeingDropped(NamedTuple):
window_id: int # the window whose title bar is currently highlighted as a drop target
quadrant: int = 0 # 0=none, 1=left, 2=right, 3=top, 4=bottom, 5=full(swap)
quadrant: int = 0 # 0=none, 1=left, 2=right, 3=top, 4=bottom, 5=full+titlebar, 6=full
class TabManager: # {{{
@@ -1921,27 +1921,30 @@ class TabManager: # {{{
if dest_window and dest_window.id != window_id:
from .fast_data_types import viewport_for_window as _vfw
central = _vfw(self.os_window_id)[0]
rel_x = x - central.left
rel_y = y - central.top
in_title_bar = False
if dest_window.show_title_bar:
from .fast_data_types import cell_size_for_window
_, ch = cell_size_for_window(self.os_window_id)
g = dest_window.geometry
opts = get_options()
tb_top = g.top if opts.window_title_bar == 'top' else g.bottom - ch
in_title_bar = tb_top <= rel_y < tb_top + ch
if not in_title_bar:
active_tab = self.active_tab
if active_tab is not None and hasattr(active_tab.current_layout, 'insert_window_next_to'):
g = dest_window.geometry
dx = rel_x - (g.left + g.right) / 2
dy = rel_y - (g.top + g.bottom) / 2
quad_map = {'left': 1, 'right': 2, 'top': 3, 'bottom': 4}
direction = ('right' if dx > 0 else 'left') if abs(dx) >= abs(dy) else ('bottom' if dy > 0 else 'top')
self._set_drag_target_window(dest_window.id, quad_map[direction])
if tb_top <= rel_y < tb_top + ch:
# Title bar hover: full window + title bar highlight (swap)
self._set_drag_target_window(dest_window.id, 5)
return
self._set_drag_target_window(dest_window.id, 5)
active_tab = self.active_tab
if active_tab is not None and hasattr(active_tab.current_layout, 'insert_window_next_to'):
# Splits layout body hover: directional half-window overlay
rel_x = x - central.left
g = dest_window.geometry
dx = rel_x - (g.left + g.right) / 2
dy = rel_y - (g.top + g.bottom) / 2
quad_map = {'left': 1, 'right': 2, 'top': 3, 'bottom': 4}
direction = ('right' if dx > 0 else 'left') if abs(dx) >= abs(dy) else ('bottom' if dy > 0 else 'top')
self._set_drag_target_window(dest_window.id, quad_map[direction])
else:
# All other body hover: full window overlay only (reorder/swap, no title bar flash)
self._set_drag_target_window(dest_window.id, 6)
else:
self._set_drag_target_window(0)