Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update timer2 widget to app-mode (full screen mode) #29

Merged
merged 8 commits into from
Dec 15, 2021
Merged

update timer2 widget to app-mode (full screen mode) #29

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
498d451
update timer2 widget to app-mode (full screen mode)
Oct 15, 2021
cb454fa
update Timer2 for NV14
Oct 18, 2021
c603008
update Timer2 for NV14 - dynamic positioning
Oct 18, 2021
04ded17
update Timer2 for NV14 - dynamic positioning
Oct 18, 2021
47b3eec
update Timer2 for horus - dynamic positioning to adapt to new layouts
Oct 23, 2021
badf572
update Timer2 for horus - dynamic positioning to adapt to new layouts…
Oct 24, 2021
ac872b3
update Timer2 for horus - return back the timer description on small …
Dec 15, 2021
0350ec2
[Timer2] return back the timer description on small area for NV14 also
pfeerick Dec 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update Timer2 for horus - dynamic positioning to adapt to new layouts… 
…, handle better the sizing
  • Loading branch information
offer-shmuely committed Oct 24, 2021
commit badf572235ffe9db4bd762a646e6194a8bc9c292
24 changes: 14 additions & 10 deletions sdcard/horus/WIDGETS/Timer2/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ local options = {
}

local function log(s)
--return;
print("timer2: " .. s)
return;
--print("timer2: " .. s)
end

local function create(zone, options)
Expand Down Expand Up @@ -75,19 +75,23 @@ local function getTimerHeader(wgt, t1)
end

local function getFontSize(wgt, txt)
local w,h = lcd.sizeText(txt, XXLSIZE)
wide_txt = string.gsub(txt, "[1-9]", "0")
--log(string.gsub("******* 12:34:56", "[1-9]", "0"))
log("wide_txt: " .. wide_txt)

local w,h = lcd.sizeText(wide_txt, XXLSIZE)
log(string.format("XXLSIZE w: %d, h: %d, %s", w,h, time_str))
if w < wgt.zone.w and h <= wgt.zone.h then
return XXLSIZE
end

w,h = lcd.sizeText(txt, DBLSIZE)
w,h = lcd.sizeText(wide_txt, DBLSIZE)
log(string.format("DBLSIZE w: %d, h: %d, %s", w,h, time_str))
if w < wgt.zone.w and h <= wgt.zone.h then
return DBLSIZE
end

w,h = lcd.sizeText(txt, MIDSIZE)
w,h = lcd.sizeText(wide_txt, MIDSIZE)
log(string.format("MIDSIZE w: %d, h: %d, %s", w,h, time_str))
if w < wgt.zone.w and h <= wgt.zone.h then
return MIDSIZE
Expand Down Expand Up @@ -123,7 +127,8 @@ local function refresh(wgt, event, touchState)
zone_h = 252
end

local ts_w,ts_h = lcd.sizeText(time_str, font_size)
wide_time_str = string.gsub(time_str, "[1-9]", "0")
local ts_w,ts_h = lcd.sizeText(wide_time_str, font_size)
local dx = (zone_w - ts_w) /2
local dy = timer_info_h -1
local need_timer_info = true
Expand All @@ -133,10 +138,9 @@ local function refresh(wgt, event, touchState)
dy = 0
end

log(string.format("timer_info: timer_info_x:%d, timer_info_h: %d", timer_info_w, timer_info_h))
log(string.format("x=%d, y=%d, w=%d, h=%d", wgt.zone.x, wgt.zone.y, zone_w, zone_h))
log(string.format("dx: %d, dy: %d, zone_w: %d, zone_h: %d, ts_w: %d, ts_h: %d)", dx, dy, zone_w ,zone_h , ts_w, ts_h))

--log(string.format("timer_info: timer_info_x:%d, timer_info_h: %d", timer_info_w, timer_info_h))
--log(string.format("x=%d, y=%d, w=%d, h=%d", wgt.zone.x, wgt.zone.y, zone_w, zone_h))
--log(string.format("dx: %d, dy: %d, zone_w: %d, zone_h: %d, ts_w: %d, ts_h: %d)", dx, dy, zone_w ,zone_h , ts_w, ts_h))

-- draw timer info
if (need_timer_info) then
Expand Down
20 changes: 12 additions & 8 deletions sdcard/nv14/WIDGETS/Timer2/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,19 +75,23 @@ local function getTimerHeader(wgt, t1)
end

local function getFontSize(wgt, txt)
local w,h = lcd.sizeText(txt, XXLSIZE)
wide_txt = string.gsub(txt, "[1-9]", "0")
--log(string.gsub("******* 12:34:56", "[1-9]", "0"))
log("wide_txt: " .. wide_txt)

local w,h = lcd.sizeText(wide_txt, XXLSIZE)
log(string.format("XXLSIZE w: %d, h: %d, %s", w,h, time_str))
if w < wgt.zone.w and h <= wgt.zone.h then
return XXLSIZE
end

w,h = lcd.sizeText(txt, DBLSIZE)
w,h = lcd.sizeText(wide_txt, DBLSIZE)
log(string.format("DBLSIZE w: %d, h: %d, %s", w,h, time_str))
if w < wgt.zone.w and h <= wgt.zone.h then
return DBLSIZE
end

w,h = lcd.sizeText(txt, MIDSIZE)
w,h = lcd.sizeText(wide_txt, MIDSIZE)
log(string.format("MIDSIZE w: %d, h: %d, %s", w,h, time_str))
if w < wgt.zone.w and h <= wgt.zone.h then
return MIDSIZE
Expand Down Expand Up @@ -123,7 +127,8 @@ local function refresh(wgt, event, touchState)
zone_h = 480
end

local ts_w,ts_h = lcd.sizeText(time_str, font_size)
wide_time_str = string.gsub(time_str, "[1-9]", "0")
local ts_w,ts_h = lcd.sizeText(wide_time_str, font_size)
local dx = (zone_w - ts_w) /2
local dy = timer_info_h -1
local need_timer_info = true
Expand All @@ -133,10 +138,9 @@ local function refresh(wgt, event, touchState)
dy = 0
end

log(string.format("timer_info: timer_info_x:%d, timer_info_h: %d", timer_info_w, timer_info_h))
log(string.format("x=%d, y=%d, w=%d, h=%d", wgt.zone.x, wgt.zone.y, zone_w, zone_h))
log(string.format("dx: %d, dy: %d, zone_w: %d, zone_h: %d, ts_w: %d, ts_h: %d)", dx, dy, zone_w ,zone_h , ts_w, ts_h))

--log(string.format("timer_info: timer_info_x:%d, timer_info_h: %d", timer_info_w, timer_info_h))
--log(string.format("x=%d, y=%d, w=%d, h=%d", wgt.zone.x, wgt.zone.y, zone_w, zone_h))
--log(string.format("dx: %d, dy: %d, zone_w: %d, zone_h: %d, ts_w: %d, ts_h: %d)", dx, dy, zone_w ,zone_h , ts_w, ts_h))

-- draw timer info
if (need_timer_info) then
Expand Down