norcal 1.1.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01d60640ac4be6724791dd1a510ca21f17748c5cebb705c2acc33864353ee3f2
-  data.tar.gz: 6f393645e5b43e5671d71acbfdb132a32aa9add25524e725ae8f25a878879b7d
+  metadata.gz: bfb181fb12eccf2f5a2a573755d884474dc74eebddf4391fd6a88c5adc55ec7d
+  data.tar.gz: a6fe09085766141d71509c87c8ff79aec265453c1456eac18646112a39fe599e
 SHA512:
-  metadata.gz: c181d09cbb95b52c24e220c9dc3293fe738d2614cff48d1e65766b4ef18aa2a48e33c8998fb1a420a4d2b12633fd1f2abb881b6501cb597beca45c5ff3ac7cfb
-  data.tar.gz: 331b2f5093a691edb71a32b36c906b0c76471baf0cfc38555bc540935ede4d8c88bb73381f815110f59bb7f31bb9bd29e119097c998c41d1de62de8a3ef8898b
+  metadata.gz: de5b45e2e61b174ec3a3e7b1910f0f50eb063ebc3deeecbe74996750a942aa50ed8d4d46e60bea7be0a47a5cdcddbce9e8433ffd596d7e7eeee031a500b48178
+  data.tar.gz: f832d1ff523264fdf967f3ce98cd00bb8f77ada069d3b5ec6df432bc36b08cebe90c851824c2df22380cd381842c7af9aca63c23945c8750711d921804de965a

data/README.md

@@ -31,7 +31,7 @@ gem install norcal
 git clone https://github.com/baosen/norcal.git
 cd norcal
 gem build norcal.gemspec
-gem install norcal-1.1.0.gem
+gem install norcal-1.3.0.gem
 ```
 
 ## Usage
@@ -49,7 +49,8 @@ norcal --light 2026 # light mode, specific year
 - ISO week numbers, Monday-first weeks
 - Sundays and public holidays in red, Saturdays in gray
 - Easter-based movable holidays (Computus algorithm)
-- Notable dates: royal birthdays, Samefolkets dag, Morsdag, Farsdag, solverv, sommertid, and more
+- Notable dates: royal birthdays, Samefolkets dag, Morsdag, Farsdag, solverv, sommertid, advent, and more
+- Filter to show only red days (public holidays)
 - Today highlighted with yellow background
 - Dark mode (default) and light mode, with toggle button
 - Zoom in/out (`+`/`–` buttons, Ctrl+scroll, Ctrl++/Ctrl+-)

data/bin/norcal

@@ -61,13 +61,13 @@ end
 def red_days(year)
   e = easter(year)
   {
-    Date.new(year, 1, 1)   => "Nyttårsdag",
+    Date.new(year, 1, 1)   => "Første nyttårsdag",
     e - 3                   => "Skjærtorsdag",
     e - 2                   => "Langfredag",
     e                       => "1. påskedag",
     e + 1                   => "2. påskedag",
     Date.new(year, 5, 1)   => "Arbeidernes dag",
-    e + 39                  => "Kr. Himmelfartsdag",
+    e + 39                  => "Kristi himmelfartsdag",
     Date.new(year, 5, 17)  => "Grunnlovsdag",
     e + 49                  => "1. pinsedag",
     e + 50                  => "2. pinsedag",
@@ -87,44 +87,55 @@ def notable_dates(year)
   nov27         = Date.new(year, 11, 27)
   advent1       = nov27 + ((7 - nov27.cwday) % 7)
 
+  botsdag = last_wday(year, 10, 7)  # last Sunday in October
+
   [
-    [Date.new(year, 1, 1),   "Nyttårsdag",                                    true],
+    [Date.new(year, 1, 1),   "Første nyttårsdag",                                    true],
     [Date.new(year, 1, 21),  "Prinsesse Ingrid Alexandra, #{year - 2004} år", false],
     [Date.new(year, 2, 6),   "Samefolkets dag",                               false],
     [morsdag,                 "Morsdag",                                        false],
-    [Date.new(year, 2, 14),  "St. Valentines dag",                             false],
+    [Date.new(year, 2, 14),  "Valentinsdag",                                   false],
     [fastelavn,               "Fastelavn",                                      false],
     [Date.new(year, 2, 21),  "Kong Harald, #{year - 1937} år",                 false],
+    [Date.new(year, 3, 8),   "Kvinnedagen",                                    false],
     [Date.new(year, 3, 20),  "Vårjevndøgn",                                    false],
     [sommer_start,            "Sommertid start",                                false],
     [e - 7,                   "Palmesøndag",                                    true],
     [e - 3,                   "Skjærtorsdag",                                   true],
     [e - 2,                   "Langfredag",                                     true],
+    [e - 1,                   "Påskeaften",                                     false],
     [e,                       "1. påskedag",                                    true],
     [e + 1,                   "2. påskedag",                                    true],
     [Date.new(year, 5, 1),   "Arbeidernes dag",                                true],
     [Date.new(year, 5, 8),   "Frigjøringsdag 1945",                            false],
-    [e + 39,                  "Kr. Himmelfartsdag",                             true],
+    [e + 39,                  "Kristi himmelfartsdag",                             true],
     [Date.new(year, 5, 17),  "Grunnlovsdag 1814",                              true],
+    [e + 48,                  "Pinseaften",                                     false],
     [e + 49,                  "1. pinsedag",                                    true],
     [e + 50,                  "2. pinsedag",                                    true],
     [Date.new(year, 6, 7),   "Unionsoppløsning 1905",                          false],
     [Date.new(year, 6, 21),  "Sommersolverv",                                   false],
-    [Date.new(year, 6, 23),  "Jonsokaften",                                    false],
+    [Date.new(year, 6, 23),  "Sankthansaften",                                 false],
     [Date.new(year, 7, 4),   "Dronning Sonja, #{year - 1937} år",             false],
     [Date.new(year, 7, 20),  "Kronprins Haakon, #{year - 1973} år",           false],
     [Date.new(year, 7, 29),  "Olsokdagen",                                    false],
     [Date.new(year, 8, 19),  "Kronprinsesse Mette-Marit, #{year - 1973} år",  false],
     [Date.new(year, 9, 23),  "Høstjevndøgn",                                   false],
+    [botsdag,                 "Bots- og bededag",                               false],
     [sommer_slutt,            "Sommertid slutt",                                false],
     [Date.new(year, 10, 31), "Halloween",                                      false],
     [Date.new(year, 11, 1),  "Allehelgensdag",                                false],
     [farsdag,                 "Farsdag",                                        false],
     [advent1,                 "1. søndag i advent",                             false],
+    [advent1 + 7,             "2. søndag i advent",                             false],
     [Date.new(year, 12, 13), "Luciadagen",                                    false],
+    [advent1 + 14,            "3. søndag i advent",                             false],
+    [advent1 + 21,            "4. søndag i advent",                             false],
     [Date.new(year, 12, 21), "Vintersolverv",                                  false],
+    [Date.new(year, 12, 24), "Julaften",                                       false],
     [Date.new(year, 12, 25), "1. juledag",                                     true],
     [Date.new(year, 12, 26), "2. juledag",                                     true],
+    [Date.new(year, 12, 31), "Nyttårsaften",                                   false],
   ].sort_by { |d, _, _| d }
 end
 
@@ -149,6 +160,7 @@ THEME = {
 $dark = ARGV.delete('--light') ? false : true
 $year = (ARGV[0] || Date.today.year).to_i
 $zoom = 0
+$red_only = false
 
 def theme
   THEME[$dark ? :dark : :light]
@@ -170,56 +182,87 @@ def make_fonts
   }
 end
 
-root = TkRoot.new do
+$root = TkRoot.new do
   title "norcal"
 end
 
-# -- Calendar content ----------------------------------------------------------
+# -- Widget tracking for in-place updates --------------------------------------
+
+# All trackable widgets, grouped by update type.
+# Labels store {w: widget, fg: theme_key, bg: theme_key, font: font_key}.
+# Buttons store {w: widget, fg: theme_key, text_key: theme_key or nil, text: static}.
+$w  = { bg: [], border: [], sep: [], labels: [], texts: [], buttons: [] }
+$wn = { bg: [], border: [], sep: [], texts: [] }  # notable-only (rebuilt on filter)
 
-def render_month(parent, year, month, holidays, f)
+# Apply current theme + zoom to all tracked widgets (no widget recreation).
+def restyle
   t = theme
+  f = make_fonts
+
+  $root.configure(background: t[:bg])
+  $canvas.configure(background: t[:bg])
+  $scrollbar.configure(background: t[:bg], troughcolor: t[:bg])
+  $root.title = "Kalender #{$year}"
+
+  ($w[:bg] + $wn[:bg]).each         { |w| w.configure(background: t[:bg]) }
+  ($w[:border] + $wn[:border]).each { |w| w.configure(background: t[:bg], highlightbackground: t[:border]) }
+  ($w[:sep] + $wn[:sep]).each       { |w| w.configure(background: t[:sep]) }
+
+  $w[:labels].each do |e|
+    e[:w].configure(foreground: t[e[:fg]], background: t[e[:bg]], font: f[e[:font]])
+  end
 
+  ($w[:texts] + $wn[:texts]).each do |tw|
+    tab = [65 + $zoom * 4, 40].max
+    tw.configure(background: t[:bg], font: f[:note], tabs: tab.to_s)
+    tw.tag_configure('dt',   foreground: t[:fg],      font: f[:note_b])
+    tw.tag_configure('dtr',  foreground: t[:red],      font: f[:note_b])
+    tw.tag_configure('desc', foreground: t[:desc_fg], font: f[:note_d])
+  end
+
+  $w[:buttons].each do |e|
+    text = e[:text_key] ? t[e[:text_key]] : (e[:text].respond_to?(:call) ? e[:text].call : e[:text])
+    e[:w].configure(text: text, font: f[:btn], foreground: t[e[:fg]],
+                    background: t[:bg], activebackground: t[:bg], activeforeground: t[:fg])
+  end
+end
+
+# -- Build calendar (one-time per year) ----------------------------------------
+
+def build_month(parent, year, month, holidays)
   first    = Date.new(year, month, 1)
   last_day = Date.new(year, month, -1)
   monday   = first - (first.cwday - 1)
   today    = Date.today
 
-  outer = TkFrame.new(parent) {
-    borderwidth 1; relief 'solid'; background t[:bg]
-    highlightbackground t[:border]; highlightthickness 0
-  }
+  outer = TkFrame.new(parent) { borderwidth 1; relief 'solid'; highlightthickness 0 }
+  $w[:border] << outer
 
-  grid = TkFrame.new(outer) { background t[:bg]; padx 6; pady 4 }
+  grid = TkFrame.new(outer) { padx 6; pady 4 }
+  $w[:bg] << grid
   grid.pack
 
-  # Month name header
-  TkLabel.new(grid) {
-    text MONTHS_NO[month - 1]; font f[:mheader]; foreground t[:fg]; background t[:bg]
-  }.grid(row: 0, column: 0, columnspan: 8, pady: [0, 2])
+  hdr = TkLabel.new(grid) { text MONTHS_NO[month - 1] }
+  $w[:labels] << { w: hdr, fg: :fg, bg: :bg, font: :mheader }
+  hdr.grid(row: 0, column: 0, columnspan: 8, pady: [0, 2])
 
-  # Day-name headers
-  TkLabel.new(grid) {
-    text 'Uke'; font f[:cal]; foreground t[:dkgray]; background t[:bg]
-  }.grid(row: 1, column: 0, sticky: 'e', padx: [0, 4])
+  uke = TkLabel.new(grid) { text 'Uke' }
+  $w[:labels] << { w: uke, fg: :dkgray, bg: :bg, font: :cal }
+  uke.grid(row: 1, column: 0, sticky: 'e', padx: [0, 4])
 
   DAYS_NO.each_with_index do |d, i|
-    fg = case i
-         when 5 then t[:gray]
-         when 6 then t[:red]
-         else t[:fg]
-         end
-    TkLabel.new(grid) {
-      text d; font f[:cal_bold]; foreground fg; background t[:bg]
-    }.grid(row: 1, column: i + 1, sticky: 'e')
+    fg_key = case i when 5 then :gray when 6 then :red else :fg end
+    lbl = TkLabel.new(grid) { text d }
+    $w[:labels] << { w: lbl, fg: fg_key, bg: :bg, font: :cal_bold }
+    lbl.grid(row: 1, column: i + 1, sticky: 'e')
   end
 
-  # Week rows
   row = 2
   cur = monday
   while cur <= last_day
-    TkLabel.new(grid) {
-      text cur.cweek.to_s; font f[:cal]; foreground t[:dkgray]; background t[:bg]
-    }.grid(row: row, column: 0, sticky: 'e', padx: [0, 4])
+    wk = TkLabel.new(grid) { text cur.cweek.to_s }
+    $w[:labels] << { w: wk, fg: :dkgray, bg: :bg, font: :cal }
+    wk.grid(row: row, column: 0, sticky: 'e', padx: [0, 4])
 
     7.times do |i|
       day = cur + i
@@ -227,263 +270,229 @@ def render_month(parent, year, month, holidays, f)
         is_red   = day.cwday == 7 || holidays.key?(day)
         is_sat   = day.cwday == 6 && !holidays.key?(day)
         is_today = day == today
-        fg = if is_red then t[:red]
-             elsif is_sat then t[:gray]
-             else t[:fg]
-             end
-        TkLabel.new(grid) {
-          text day.day.to_s
-          font(is_today ? f[:cal_bold] : f[:cal])
-          foreground fg
-          background(is_today ? t[:today_bg] : t[:bg])
-        }.grid(row: row, column: i + 1, sticky: 'e')
+        fg_key   = is_red ? :red : (is_sat ? :gray : :fg)
+        bg_key   = is_today ? :today_bg : :bg
+        font_key = is_today ? :cal_bold : :cal
+
+        lbl = TkLabel.new(grid) { text day.day.to_s }
+        $w[:labels] << { w: lbl, fg: fg_key, bg: bg_key, font: font_key }
+        lbl.grid(row: row, column: i + 1, sticky: 'e')
       end
     end
     row += 1
     cur += 7
   end
 
-  # Pad empty rows so all months have the same height (max 6 week rows)
   while row < 8
-    TkLabel.new(grid) { text ' '; font f[:cal]; background t[:bg] }
-      .grid(row: row, column: 0)
+    pad = TkLabel.new(grid) { text ' ' }
+    $w[:labels] << { w: pad, fg: :fg, bg: :bg, font: :cal }
+    pad.grid(row: row, column: 0)
     row += 1
   end
 
-  # Uniform column widths
   (1..7).each { |c| grid.grid_columnconfigure(c, uniform: 'day', minsize: 22) }
-
   outer
 end
 
-def render_notable(parent, year, f)
-  t = theme
-  dates = notable_dates(year)
+def build_notable(parent, year)
+  $wn.each_value(&:clear)
 
-  # Split into 3 roughly-equal columns
-  third = (dates.size / 3.0).ceil
-  cols = dates.each_slice(third).to_a
+  dates = notable_dates(year)
+  dates = dates.select { |_, _, is_red| is_red } if $red_only
+  third = [(dates.size / 3.0).ceil, 1].max
+  cols  = dates.each_slice(third).to_a
 
-  outer = TkFrame.new(parent) {
-    borderwidth 1; relief 'solid'; background t[:bg]
-    highlightbackground t[:border]; highlightthickness 0
-  }
+  outer = TkFrame.new(parent) { borderwidth 1; relief 'solid'; highlightthickness 0 }
+  $wn[:border] << outer
 
-  inner = TkFrame.new(outer) { background t[:bg] }
+  inner = TkFrame.new(outer)
+  $wn[:bg] << inner
   inner.pack(padx: 5, pady: 5, fill: 'both')
 
   cols.each_with_index do |entries, ci|
     tw = TkText.new(inner) {
       width 1; height(entries.size + 4)
-      font f[:note]; borderwidth 0; highlightthickness 0
-      wrap 'word'; background t[:bg]; padx 3; pady 2
-      cursor ''; insertwidth 0
-      tabs '65'
+      borderwidth 0; highlightthickness 0
+      wrap 'word'; padx 3; pady 2; cursor ''; insertwidth 0
     }
-    tw.tag_configure('dt',  foreground: t[:fg],  font: f[:note_b])
-    tw.tag_configure('dtr', foreground: t[:red],  font: f[:note_b])
-    tw.tag_configure('desc', foreground: t[:desc_fg], font: f[:note_d])
+    $wn[:texts] << tw
 
     entries.each_with_index do |(date, desc, is_red), i|
       dtag = is_red ? 'dtr' : 'dt'
-      date_str = "#{date.day}. #{MABBR_NO[date.month - 1]}"
-      tw.insert('end', date_str, dtag)
+      tw.insert('end', "#{date.day}. #{MABBR_NO[date.month - 1]}", dtag)
       tw.insert('end', "\t")
       tw.insert('end', desc, 'desc')
       tw.insert('end', "\n") unless i == entries.size - 1
     end
-
     tw.state 'disabled'
     tw.grid(row: 0, column: ci * 2, sticky: 'nsew', padx: [0, 2])
     inner.grid_columnconfigure(ci * 2, weight: 1, uniform: 'notecol')
     inner.grid_rowconfigure(0, weight: 1)
 
-    # vertical separator between columns (except after last)
     if ci < cols.size - 1
-      sep = TkFrame.new(inner) { background t[:sep]; width 1 }
+      sep = TkFrame.new(inner) { width 1 }
+      $wn[:sep] << sep
       sep.grid(row: 0, column: ci * 2 + 1, sticky: 'ns', padx: 4)
     end
   end
-
   outer
 end
 
-def build_calendar(parent, year, f)
-  t = theme
+def rebuild_notable
+  $notable_frame&.destroy
+  $notable_frame = build_notable($notable_parent, $year)
+  $notable_frame.grid(row: 4, column: 0, columnspan: 3, padx: 3, pady: [4, 0], sticky: 'ew')
+  restyle
+end
+
+def build_buttons(parent)
+  btn_bar = TkFrame.new(parent)
+  $w[:bg] << btn_bar
+  btn_bar.grid(row: 5, column: 0, columnspan: 3, pady: [4, 0])
+
+  b1 = TkButton.new(btn_bar) { relief 'flat'; borderwidth 0; command { $dark = !$dark; restyle } }
+  $w[:buttons] << { w: b1, fg: :dkgray, text_key: :toggle_label, text: nil }
+  b1.pack(side: 'left', padx: 4)
+
+  b2 = TkButton.new(btn_bar) { relief 'flat'; borderwidth 0; command { $zoom += 1; restyle } }
+  $w[:buttons] << { w: b2, fg: :dkgray, text_key: nil, text: '+' }
+  b2.pack(side: 'left', padx: 2)
+
+  b3 = TkButton.new(btn_bar) { relief 'flat'; borderwidth 0; command { $zoom -= 1 if $zoom > -8; restyle } }
+  $w[:buttons] << { w: b3, fg: :dkgray, text_key: nil, text: "\u2013" }
+  b3.pack(side: 'left', padx: 2)
+
+  b4 = TkButton.new(btn_bar) { relief 'flat'; borderwidth 0; command { $fit.call(false) } }
+  $w[:buttons] << { w: b4, fg: :dkgray, text_key: nil, text: 'fit' }
+  b4.pack(side: 'left', padx: 2)
+
+  b5 = TkButton.new(btn_bar) { relief 'flat'; borderwidth 0
+    command {
+      $red_only = !$red_only
+      rebuild_notable
+      restyle  # update button text
+    }
+  }
+  $w[:buttons] << { w: b5, fg: :dkgray, text_key: nil,
+                    text: -> { $red_only ? 'alle dager' : "bare r\u00f8de dager" } }
+  b5.pack(side: 'left', padx: 2)
+end
+
+def build_all(year)
+  $w.each_value(&:clear)
+  $inner_frame&.destroy
+
   holidays = red_days(year)
 
-  frame = TkFrame.new(parent) { background t[:bg] }
+  $inner_frame = TkFrame.new($canvas)
+  $w[:bg] << $inner_frame
 
-  # Single grid for months and notable dates
-  grid_f = TkFrame.new(frame) { background t[:bg] }
-  grid_f.pack(padx: 10, pady: [2, 8])
+  title = TkLabel.new($inner_frame) { text year.to_s }
+  $w[:labels] << { w: title, fg: :title_fg, bg: :bg, font: :title }
+  title.pack(pady: [8, 2])
+
+  frame = TkFrame.new($inner_frame)
+  $w[:bg] << frame
+  frame.pack(padx: 10, pady: [2, 8])
+
+  grid_f = TkFrame.new(frame)
+  $w[:bg] << grid_f
+  grid_f.pack
 
   12.times do |idx|
-    m_frame = render_month(grid_f, year, idx + 1, holidays, f)
-    m_frame.grid(row: idx / 3, column: idx % 3, padx: 3, pady: 3, sticky: 'nsew')
+    build_month(grid_f, year, idx + 1, holidays)
+      .grid(row: idx / 3, column: idx % 3, padx: 3, pady: 3, sticky: 'nsew')
   end
 
-  # Notable dates in row 4, spanning all 3 month columns
-  note_f = render_notable(grid_f, year, f)
-  note_f.grid(row: 4, column: 0, columnspan: 3, padx: 3, pady: [4, 0], sticky: 'ew')
+  $notable_parent = grid_f
+  $notable_frame = build_notable(grid_f, year)
+  $notable_frame.grid(row: 4, column: 0, columnspan: 3, padx: 3, pady: [4, 0], sticky: 'ew')
 
-  # Button bar: toggle + zoom
-  btn_bar = TkFrame.new(grid_f) { background t[:bg] }
-  btn_bar.grid(row: 5, column: 0, columnspan: 3, pady: [4, 0])
+  build_buttons(grid_f)
+  3.times { |c| grid_f.grid_columnconfigure(c, weight: 1) }
 
-  TkButton.new(btn_bar) {
-    text t[:toggle_label]; font f[:btn]
-    relief 'flat'; borderwidth 0
-    foreground t[:dkgray]; background t[:bg]
-    activebackground t[:bg]; activeforeground t[:fg]
-    command { $dark = !$dark; $rebuild&.call }
-  }.pack(side: 'left', padx: 4)
-
-  TkButton.new(btn_bar) {
-    text '+'; font f[:btn]
-    relief 'flat'; borderwidth 0
-    foreground t[:dkgray]; background t[:bg]
-    activebackground t[:bg]; activeforeground t[:fg]
-    command { $zoom += 1; $rebuild&.call }
-  }.pack(side: 'left', padx: 2)
-
-  TkButton.new(btn_bar) {
-    text "\u2013"; font f[:btn]  # en-dash for minus
-    relief 'flat'; borderwidth 0
-    foreground t[:dkgray]; background t[:bg]
-    activebackground t[:bg]; activeforeground t[:fg]
-    command { $zoom -= 1 if $zoom > -8; $rebuild&.call }
-  }.pack(side: 'left', padx: 2)
-
-  TkButton.new(btn_bar) {
-    text 'fit'; font f[:btn]
-    relief 'flat'; borderwidth 0
-    foreground t[:dkgray]; background t[:bg]
-    activebackground t[:bg]; activeforeground t[:fg]
-    command { $fit&.call }
-  }.pack(side: 'left', padx: 2)
+  # Embed in canvas
+  $canvas.delete('all')
+  $canvas_win = $canvas.create(:window, 0, 0, window: $inner_frame, anchor: 'nw')
 
-  3.times { |c| grid_f.grid_columnconfigure(c, weight: 1) }
+  center = proc {
+    cw = $canvas.winfo_width;  ch = $canvas.winfo_height
+    fw = $inner_frame.winfo_reqwidth; fh = $inner_frame.winfo_reqheight
+    $canvas.coords($canvas_win, [(cw - fw) / 2, 0].max, [(ch - fh) / 2, 0].max)
+    $canvas.configure(scrollregion: "0 0 #{[cw, fw].max} #{[ch, fh].max}")
+  }
+  $inner_frame.bind('Configure', center)
+  $canvas.bind('Configure', center)
 
-  frame
+  restyle
 end
 
 # -- Scrollable wrapper --------------------------------------------------------
 
-$scrollbar = TkScrollbar.new(root)
-$canvas = TkCanvas.new(root) {
-  highlightthickness 0; borderwidth 0
-}
+$scrollbar = TkScrollbar.new($root)
+$canvas = TkCanvas.new($root) { highlightthickness 0; borderwidth 0 }
 $canvas.configure(yscrollcommand: proc { |*a| $scrollbar.set(*a) })
 $scrollbar.command(proc { |*a| $canvas.yview(*a) })
-
 $scrollbar.pack(side: 'right', fill: 'y')
 $canvas.pack(side: 'left', fill: 'both', expand: true)
 
-# Mouse wheel scrolling
-root.bind('MouseWheel') { |e| $canvas.yview_scroll(-e.delta / 120, 'units') }
-root.bind('Button-4') { $canvas.yview_scroll(-3, 'units') }
-root.bind('Button-5') { $canvas.yview_scroll(3, 'units') }
+# Scrolling
+$root.bind('MouseWheel') { |e| $canvas.yview_scroll(-e.delta / 120, 'units') }
+$root.bind('Button-4') { $canvas.yview_scroll(-3, 'units') }
+$root.bind('Button-5') { $canvas.yview_scroll(3, 'units') }
 
-# Keyboard zoom: Ctrl++ and Ctrl+-
-root.bind('Control-plus')  { $zoom += 1; $rebuild&.call }
-root.bind('Control-equal') { $zoom += 1; $rebuild&.call }  # Ctrl+= (unshifted +)
-root.bind('Control-minus') { $zoom -= 1 if $zoom > -8; $rebuild&.call }
+# Keyboard zoom
+$root.bind('Control-plus')  { $zoom += 1; restyle }
+$root.bind('Control-equal') { $zoom += 1; restyle }
+$root.bind('Control-minus') { $zoom -= 1 if $zoom > -8; restyle }
 
 # Ctrl+mouse wheel zoom
-root.bind('Control-MouseWheel') { |e|
+$root.bind('Control-MouseWheel') { |e|
   if e.delta > 0 then $zoom += 1 else $zoom -= 1 if $zoom > -8 end
-  $rebuild&.call
+  restyle
 }
-root.bind('Control-Button-4') { $zoom += 1; $rebuild&.call }
-root.bind('Control-Button-5') { $zoom -= 1 if $zoom > -8; $rebuild&.call }
-
-# -- Build & rebuild -----------------------------------------------------------
+$root.bind('Control-Button-4') { $zoom += 1; restyle }
+$root.bind('Control-Button-5') { $zoom -= 1 if $zoom > -8; restyle }
 
-$inner_frame = nil
-$rebuild = nil
+# -- Fit to window -------------------------------------------------------------
 
-$rebuild = proc {
-  t = theme
-  f = make_fonts
-
-  $inner_frame&.destroy
-  root.configure(background: t[:bg])
-  $canvas.configure(background: t[:bg])
-  $scrollbar.configure(background: t[:bg], troughcolor: t[:bg])
-  root.title = "norcal - #{$year}"
-
-  $inner_frame = TkFrame.new($canvas) { background t[:bg] }
-
-  # Title
-  TkLabel.new($inner_frame) {
-    text $year.to_s; font f[:title]; foreground t[:title_fg]; background t[:bg]
-  }.pack(pady: [8, 2])
-
-  # Calendar content
-  build_calendar($inner_frame, $year, f).pack(fill: 'both', expand: true)
-
-  # Embed frame in canvas, centered
-  $canvas.delete('all')
-  $canvas_win = $canvas.create(:window, 0, 0, window: $inner_frame, anchor: 'nw')
-
-  # Center content and update scroll region on resize
-  center_content = proc {
-    cw = $canvas.winfo_width
-    ch = $canvas.winfo_height
-    fw = $inner_frame.winfo_reqwidth
-    fh = $inner_frame.winfo_reqheight
-    x = [(cw - fw) / 2, 0].max
-    y = [(ch - fh) / 2, 0].max
-    $canvas.coords($canvas_win, x, y)
-    $canvas.configure(scrollregion: "#{0} #{0} #{[cw, fw].max} #{[ch, fh].max}")
-  }
-
-  $inner_frame.bind('Configure', center_content)
-  $canvas.bind('Configure', center_content)
-}
-
-# Fit-to-window: zoom so content fills available height, then resize window
-$fit = proc {
-  # Measure current content height and extrapolate target zoom
+$fit = proc { |resize_window|
+  target_h = resize_window ? $root.winfo_screenheight - 80 : $root.winfo_height
   cur_h    = $inner_frame.winfo_reqheight.to_f
-  screen_h = root.winfo_screenheight - 80
-  base_avg = 13.0  # average base font size at zoom 0
+  base_avg = 13.0
 
-  if cur_h > 0 && screen_h > 0
-    # Current effective font size, and what it needs to be
-    cur_font  = base_avg + $zoom
-    target_font = cur_font * (screen_h / cur_h)
+  if cur_h > 0 && target_h > 0
+    cur_font    = base_avg + $zoom
+    target_font = cur_font * (target_h / cur_h)
     $zoom = (target_font - base_avg).floor
     $zoom = [$zoom, -8].max
   end
 
-  $rebuild.call
+  restyle
   Tk.update_idletasks
 
-  # If overshot, back off by one
-  if $inner_frame.winfo_reqheight > screen_h
+  if $inner_frame.winfo_reqheight > target_h
     $zoom -= 1
-    $rebuild.call
+    restyle
     Tk.update_idletasks
   end
 
-  # Size window to actual content, capped at screen
-  content_w = $inner_frame.winfo_reqwidth + 20
-  content_h = $inner_frame.winfo_reqheight
-  screen_w  = root.winfo_screenwidth
-  max_h     = root.winfo_screenheight - 50
-  w = [content_w, screen_w].min
-  h = [content_h, max_h].min
-  x = (screen_w - w) / 2
-  root.geometry("#{w}x#{h}+#{x}+0")
+  if resize_window
+    cw = $inner_frame.winfo_reqwidth + 20
+    ch = $inner_frame.winfo_reqheight
+    sw = $root.winfo_screenwidth
+    mh = $root.winfo_screenheight - 50
+    w = [cw, sw].min; h = [ch, mh].min
+    $root.geometry("#{w}x#{h}+#{(sw - w) / 2}+0")
+  end
 }
 
-# Initial build, then fit to window (withdraw during startup to avoid flicker)
-root.withdraw
-$rebuild.call
+# -- Startup -------------------------------------------------------------------
+
+$root.withdraw
+build_all($year)
 Tk.update_idletasks
-$fit.call
-root.deiconify
+$fit.call(true)
+$root.deiconify
 
 Tk.mainloop

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: norcal
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.3.0
 platform: ruby
 authors:
 - baosen