kayprish/ck
2
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Edit wall-movement functions in drw for clarity

Browse source
This commit is contained in:
Petar Kapriš 2022-03-04 16:36:25 +01:00 committed by Петар Каприш
parent 8d38a07348
commit 56fa219d2d
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
drw/wall.go
View file

@ -44,8 +44,8 @@ func monthHeight(m time.Month) int {
func bottomOfMonth(m time.Month, w time.Weekday) (time time.Time) { func bottomOfMonth(m time.Month, w time.Weekday) (time time.Time) {
last := lastDay(m) last := lastDay(m)
day := last.Day()
day := last.Day()
if w > last.Weekday() { if w > last.Weekday() {
day -= 7 day -= 7
} }
@ -102,7 +102,7 @@ func MoveUp() {
newTime := util.SelTime.AddDate(0, 0, -7) newTime := util.SelTime.AddDate(0, 0, -7)
if newTime.Month() == util.SelTime.Month() { if newTime.Month() == util.SelTime.Month() {
util.SelTime = newTime util.SelTime = newTime
} else if int(util.SelTime.Month()) > monthsWide { } else if int(util.SelTime.Month())-monthsWide >= 1 {
newMonth := util.SelTime.Month() - time.Month(monthsWide) newMonth := util.SelTime.Month() - time.Month(monthsWide)
util.SelTime = bottomOfMonth(newMonth, weekday) util.SelTime = bottomOfMonth(newMonth, weekday)
} }
@ -113,7 +113,7 @@ func MoveDown() {
newTime := util.SelTime.AddDate(0, 0, +7) newTime := util.SelTime.AddDate(0, 0, +7)
if newTime.Month() == util.SelTime.Month() { if newTime.Month() == util.SelTime.Month() {
util.SelTime = newTime util.SelTime = newTime
} else if int(util.SelTime.Month()) <= (12-1)/monthsWide*monthsWide { } else if int(util.SelTime.Month())+monthsWide <= 12 {
newMonth := util.SelTime.Month() + time.Month(monthsWide) newMonth := util.SelTime.Month() + time.Month(monthsWide)
util.SelTime = topOfMonth(newMonth, weekday) util.SelTime = topOfMonth(newMonth, weekday)
} }
@ -122,7 +122,7 @@ func MoveDown() {
func MoveRight() { func MoveRight() {
if util.SelTime.Weekday() != time.Sunday && util.SelTime.Day() != lastDay(util.SelTime.Month()).Day() { if util.SelTime.Weekday() != time.Sunday && util.SelTime.Day() != lastDay(util.SelTime.Month()).Day() {
util.SelTime = util.SelTime.AddDate(0, 0, 1) util.SelTime = util.SelTime.AddDate(0, 0, 1)
} else if int(util.SelTime.Month())%monthsWide != 0 && int(util.SelTime.Month()) != 12 { } else if int(util.SelTime.Month())%monthsWide != 0 && util.SelTime.Month() != time.December {
util.SelTime = leftmostInRow(util.SelTime.Month()+1, rowInMonth(util.SelTime.Month(), util.SelTime.Day())) util.SelTime = leftmostInRow(util.SelTime.Month()+1, rowInMonth(util.SelTime.Month(), util.SelTime.Day()))
} }
} }