mirror of
https://github.com/CCLeonOS/LeonOS.git
synced 2026-03-03 15:17:01 +00:00
fix(thread): 修正标签页位置和鼠标事件处理
调整标签页显示位置从顶部到底部,并修复鼠标事件在底部标签栏的触发条件
This commit is contained in:
@@ -184,7 +184,7 @@ local function redraw()
|
|||||||
|
|
||||||
if #tabs > 1 then
|
if #tabs > 1 then
|
||||||
local len = -scroll + 1
|
local len = -scroll + 1
|
||||||
wrappedNative.setCursorPos(1, 1)
|
wrappedNative.setCursorPos(1, h)
|
||||||
wrappedNative.setTextColor(colors.black)
|
wrappedNative.setTextColor(colors.black)
|
||||||
wrappedNative.setBackgroundColor(colors.gray)
|
wrappedNative.setBackgroundColor(colors.gray)
|
||||||
wrappedNative.clearLine()
|
wrappedNative.clearLine()
|
||||||
@@ -193,7 +193,7 @@ local function redraw()
|
|||||||
local tab = tabs[i]
|
local tab = tabs[i]
|
||||||
local name = names[i]
|
local name = names[i]
|
||||||
|
|
||||||
wrappedNative.setCursorPos(len, 1)
|
wrappedNative.setCursorPos(len, h)
|
||||||
len = len + #name
|
len = len + #name
|
||||||
|
|
||||||
if i == focused then
|
if i == focused then
|
||||||
@@ -208,20 +208,20 @@ local function redraw()
|
|||||||
end
|
end
|
||||||
|
|
||||||
tab.term.setVisible(false)
|
tab.term.setVisible(false)
|
||||||
tab.term.reposition(1, 2, w, h - 1)
|
tab.term.reposition(1, 1, w, h - 1)
|
||||||
end
|
end
|
||||||
|
|
||||||
if totalNameLength > w-2 then
|
if totalNameLength > w-2 then
|
||||||
wrappedNative.setTextColor(colors.black)
|
wrappedNative.setTextColor(colors.black)
|
||||||
wrappedNative.setBackgroundColor(colors.gray)
|
wrappedNative.setBackgroundColor(colors.gray)
|
||||||
if scroll > 0 then
|
if scroll > 0 then
|
||||||
wrappedNative.setCursorPos(1, 1)
|
wrappedNative.setCursorPos(1, h)
|
||||||
wrappedNative.write("<")
|
wrappedNative.write("<")
|
||||||
end
|
end
|
||||||
if totalNameLength - scroll > w-1 then
|
if totalNameLength - scroll > w-1 then
|
||||||
wrappedNative.setCursorPos(w, 1)
|
wrappedNative.setCursorPos(w, h)
|
||||||
wrappedNative.write(">")
|
wrappedNative.write(">")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
tabs[focused].term.setVisible(true)
|
tabs[focused].term.setVisible(true)
|
||||||
@@ -253,7 +253,7 @@ local function processEvent(event)
|
|||||||
if #event > 3 then -- mouse event
|
if #event > 3 then -- mouse event
|
||||||
|
|
||||||
if #tabs > 1 then
|
if #tabs > 1 then
|
||||||
if event[4] == 1 then
|
if event[4] == h then
|
||||||
local curX = -scroll
|
local curX = -scroll
|
||||||
|
|
||||||
if event[1] == "mouse_scroll" then
|
if event[1] == "mouse_scroll" then
|
||||||
|
|||||||
Reference in New Issue
Block a user