gemba 0.2.0 → 0.2.1

data/lib/gemba/list_picker_frame.rb

@@ -0,0 +1,271 @@
+# frozen_string_literal: true
+
+module Gemba
+  # Startup frame showing all library ROMs as a sortable treeview list.
+  #
+  # Alternative to GamePickerFrame (no boxart). Columns: Title, Last Played.
+  # Clicking a column header sorts; the active column shows a ▲/▼ indicator.
+  # Double-clicking a row emits :rom_selected. Right-clicking shows a context
+  # menu identical to the GamePickerFrame card menu.
+  # Pure Tk — no SDL2.
+  class ListPickerFrame
+    include BusEmitter
+    include Locale::Translatable
+
+    LIST_DEFAULT_W = 480
+    LIST_DEFAULT_H = 600
+    LIST_MIN_W     = 320
+    LIST_MIN_H     = 400
+
+    SORT_ASC  = ' ▲'
+    SORT_DESC = ' ▼'
+
+    def default_geometry = [LIST_DEFAULT_W, LIST_DEFAULT_H]
+    def min_geometry     = [LIST_MIN_W,     LIST_MIN_H]
+
+    def initialize(app:, rom_library:, rom_overrides: nil)
+      @app         = app
+      @rom_library = rom_library
+      @overrides   = rom_overrides
+      @built       = false
+      @sort_col    = 'last_played'
+      @sort_asc    = false   # most-recent first by default
+      @row_data    = {}      # treeview item id => RomInfo
+    end
+
+    def show
+      build_ui unless @built
+      refresh
+      @app.command(:pack, @outer, fill: :both, expand: 1)
+    end
+
+    def hide
+      @app.command(:pack, :forget, @outer) rescue nil
+    end
+
+    def cleanup; end
+
+    def receive(event, **_args)
+      case event
+      when :refresh then refresh
+      end
+    end
+
+    def aspect_ratio = nil
+    def rom_loaded?  = false
+    def sdl2_ready?  = false
+    def paused?      = false
+
+    private
+
+    def build_ui
+      @outer = '.list_picker'
+      @app.command('ttk::frame', @outer, padding: 8)
+
+      # Treeview + scrollbar
+      @tree = "#{@outer}.tree"
+      @scrollbar = "#{@outer}.scroll"
+
+      @app.command('ttk::treeview', @tree,
+        columns: Teek.make_list('title', 'last_played'),
+        show: :headings,
+        selectmode: :browse)
+
+      @app.command('ttk::scrollbar', @scrollbar, orient: :vertical,
+        command: "#{@tree} yview")
+      @app.command(@tree, :configure, yscrollcommand: "#{@scrollbar} set")
+
+      build_columns
+      bind_events
+
+      @app.command(:grid, @tree,      row: 0, column: 0, sticky: :nsew)
+      @app.command(:grid, @scrollbar, row: 0, column: 1, sticky: :ns)
+      @app.command(:grid, :columnconfigure, @outer, 0, weight: 1)
+      @app.command(:grid, :rowconfigure,    @outer, 0, weight: 1)
+
+      build_toolbar
+
+      @built = true
+    end
+
+    def build_columns
+      @app.command(@tree, :heading, 'title',
+        text: translate('list_picker.columns.title') + (@sort_col == 'title' ? sort_indicator : ''),
+        anchor: :w,
+        command: proc { sort_by('title') })
+      @app.command(@tree, :heading, 'last_played',
+        text: translate('list_picker.columns.last_played') + (@sort_col == 'last_played' ? sort_indicator : ''),
+        anchor: :w,
+        command: proc { sort_by('last_played') })
+      @app.command(@tree, :column, 'title',       width: 280, stretch: 1)
+      @app.command(@tree, :column, 'last_played', width: 120, stretch: 0)
+    end
+
+    def bind_events
+      # Physical double-click fires virtual event so tests can trigger it
+      # directly without needing event generate <Double-Button-1> (forbidden in Tk 9).
+      @app.command(:bind, @tree, '<Double-Button-1>', proc {
+        @app.tcl_eval("event generate #{@tree} <<DoubleClick>>")
+      })
+      @app.command(:bind, @tree, '<<DoubleClick>>', proc {
+        iid = @app.tcl_eval("#{@tree} focus")
+        next if iid.to_s.empty?
+        rom_info = @row_data[iid]
+        emit(:rom_selected, rom_info.path) if rom_info
+      })
+
+      # Physical right-click: use %x/%y (widget-relative event coords) to
+      # identify the row, select and focus it, then fire the virtual event so
+      # tests can trigger the same code path without real pointer coordinates.
+      @app.tcl_eval(<<~TCL)
+        bind #{@tree} <Button-3> {+
+          set _iid [#{@tree} identify row %x %y]
+          if {$_iid ne {}} {
+            #{@tree} selection set $_iid
+            #{@tree} focus $_iid
+            event generate #{@tree} <<RightClick>>
+          }
+        }
+      TCL
+
+      # Virtual event reads the currently focused item. Decoupled from pointer
+      # position so tests can trigger it directly after setting focus.
+      @app.command(:bind, @tree, '<<RightClick>>', proc {
+        iid = @app.tcl_eval("#{@tree} focus")
+        rom_info = @row_data[iid.to_s]
+        post_row_menu(rom_info) if rom_info
+      })
+    end
+
+    def build_toolbar
+      sep = "#{@outer}.sep"
+      @app.command('ttk::separator', sep, orient: :horizontal)
+      @app.command(:grid, sep, row: 1, column: 0, columnspan: 2, sticky: :ew, pady: [4, 0])
+
+      toolbar = "#{@outer}.toolbar"
+      @app.command('ttk::frame', toolbar, padding: [4, 2])
+      @app.command(:grid, toolbar, row: 2, column: 0, columnspan: 2, sticky: :ew)
+
+      gear_btn  = "#{toolbar}.gear"
+      gear_menu = "#{toolbar}.gearmenu"
+      @app.command('ttk::button', gear_btn, text: "\u2699", width: 1,
+        command: proc { post_view_menu(gear_menu, gear_btn) })
+      @app.command(:pack, gear_btn, side: :right)
+    end
+
+    def refresh
+      @app.tcl_eval("#{@tree} delete [#{@tree} children {}]")
+      @row_data.clear
+
+      roms = sorted(@rom_library.all)
+      roms.each do |rom|
+        rom_info = RomInfo.from_rom(rom, overrides: @overrides)
+        lp       = format_last_played(rom['last_played'])
+        iid = @app.tcl_eval(
+          "#{@tree} insert {} end -values [list #{Teek.make_list(rom_info.title, lp)}]"
+        )
+        @row_data[iid] = rom_info
+      end
+    end
+
+    def sorted(roms)
+      sorted = roms.sort_by do |r|
+        case @sort_col
+        when 'title'       then r['title'].to_s.downcase
+        when 'last_played' then r['last_played'] || r['added_at'] || ''
+        end
+      end
+      @sort_asc ? sorted : sorted.reverse
+    end
+
+    def sort_by(col)
+      if @sort_col == col
+        @sort_asc = !@sort_asc
+      else
+        @sort_col = col
+        @sort_asc = (col == 'title')  # title: asc first; date: newest first
+      end
+      update_headings
+      refresh
+    end
+
+    def update_headings
+      ['title', 'last_played'].each do |col|
+        label_key = col == 'title' ? 'list_picker.columns.title' : 'list_picker.columns.last_played'
+        indicator = @sort_col == col ? sort_indicator : ''
+        @app.command(@tree, :heading, col, text: translate(label_key) + indicator)
+      end
+    end
+
+    def sort_indicator
+      @sort_asc ? SORT_ASC : SORT_DESC
+    end
+
+    def format_last_played(iso)
+      return translate('list_picker.never_played') if iso.to_s.empty?
+      require 'time'
+      Time.parse(iso).localtime.strftime('%b %-d, %Y')
+    rescue
+      iso.to_s
+    end
+
+    def post_view_menu(menu, btn)
+      @app.command(:menu, menu, tearoff: 0) unless @app.tcl_eval("winfo exists #{menu}") == '1'
+      @app.command(menu, :delete, 0, :end)
+      current = Gemba.user_config.picker_view
+      @app.command(menu, :add, :command,
+        label: "#{current == 'grid' ? "\u2713 " : '  '}#{translate('picker.toolbar.boxart_view')}",
+        command: proc { emit(:picker_view_changed, view: 'grid') })
+      @app.command(menu, :add, :command,
+        label: "#{current == 'list' ? "\u2713 " : '  '}#{translate('picker.toolbar.list_view')}",
+        command: proc { emit(:picker_view_changed, view: 'list') })
+      x = @app.tcl_eval("winfo rootx #{btn}").to_i
+      y = @app.tcl_eval("winfo rooty #{btn}").to_i
+      h = @app.tcl_eval("winfo height #{btn}").to_i
+      @app.tcl_eval("tk_popup #{menu} #{x} #{y + h}")
+    end
+
+    def post_row_menu(rom_info)
+      menu = "#{@tree}.ctx"
+      @app.command(:menu, menu, tearoff: 0) unless @app.tcl_eval("winfo exists #{menu}") == '1'
+      @app.command(menu, :delete, 0, :end)
+      @app.command(menu, :add, :command,
+        label: translate('game_picker.menu.play'),
+        command: proc { emit(:rom_selected, rom_info.path) })
+      qs_slot  = Gemba.user_config.quick_save_slot
+      qs_state = quick_save_exists?(rom_info, qs_slot)
+      @app.command(menu, :add, :command,
+        label: translate('game_picker.menu.quick_load'),
+        state: qs_state ? :normal : :disabled,
+        command: proc { emit(:rom_quick_load, path: rom_info.path, slot: qs_slot) })
+      @app.command(menu, :add, :command,
+        label: translate('game_picker.menu.set_boxart'),
+        command: proc { pick_custom_boxart(rom_info) })
+      @app.command(menu, :add, :separator)
+      @app.command(menu, :add, :command,
+        label: translate('game_picker.menu.remove'),
+        command: proc { remove_rom(rom_info) })
+      @app.tcl_eval("tk_popup #{menu} [winfo pointerx .] [winfo pointery .]")
+    end
+
+    def quick_save_exists?(rom_info, slot)
+      return false unless rom_info.rom_id
+      state_file = File.join(Gemba.user_config.states_dir, rom_info.rom_id, "state#{slot}.ss")
+      File.exist?(state_file)
+    end
+
+    def remove_rom(rom_info)
+      @rom_library.remove(rom_info.rom_id)
+      @rom_library.save!
+      refresh
+    end
+
+    def pick_custom_boxart(rom_info)
+      return unless @overrides
+      filetypes = '{{PNG Images} {.png}}'
+      path = @app.tcl_eval("tk_getOpenFile -filetypes {#{filetypes}}")
+      return if path.to_s.strip.empty?
+      @overrides.set_custom_boxart(rom_info.rom_id, path)
+    end
+  end
+end

data/lib/gemba/locales/en.yml

@@ -142,6 +142,7 @@ settings:
   ra_username_placeholder: "Username:"
   ra_token_placeholder: "Password:"
   ra_rich_presence: "Rich Presence (per-game)"
+  ra_screenshot_on_unlock: "Screenshot on achievement unlock (per-game)"
   ra_hardcore: "Hardcore mode (disables save states and rewind)"
   tip_ra_password: "Your password is only used to fetch an API token and is never saved."
   ra_login: "Login"
@@ -185,6 +186,17 @@ game_picker:
     set_boxart: "Set Boxart"
     remove: "Remove from Library"
 
+picker:
+  toolbar:
+    boxart_view: "Box art view"
+    list_view: "List view"
+
+list_picker:
+  columns:
+    title: "Title"
+    last_played: "Last Played"
+  never_played: "Never"
+
 rom_info:
   title: "ROM Info"
   field_title: "Title:"

data/lib/gemba/locales/ja.yml

@@ -142,6 +142,7 @@ settings:
   ra_username_placeholder: "ユーザー名："
   ra_token_placeholder: "パスワード："
   ra_rich_presence: "リッチプレゼンス（ゲームごと）"
+  ra_screenshot_on_unlock: "実績解除時にスクリーンショット（ゲームごと）"
   ra_hardcore: "ハードコアモード（セーブステートと巻き戻し無効）"
   tip_ra_password: "パスワードはAPIトークン取得のみに使用され、保存されません。"
   ra_login: "ログイン"
@@ -185,6 +186,17 @@ game_picker:
     set_boxart: "カスタム画像を設定"
     remove: "ライブラリから削除"
 
+picker:
+  toolbar:
+    boxart_view: "ボックスアート表示"
+    list_view: "リスト表示"
+
+list_picker:
+  columns:
+    title: "タイトル"
+    last_played: "最終プレイ日"
+  never_played: "未プレイ"
+
 rom_info:
   title: "ROM情報"
   field_title: "タイトル:"

data/lib/gemba/rom_patcher/ups.rb

@@ -106,9 +106,10 @@ module Gemba
           byte = io.read(1)
           raise "Truncated UPS patch (varint read past end)" if byte.nil?
           b      = byte.getbyte(0)
-          value |= (b & 0x7f) << shift
+          value += (b & 0x7f) << shift
           break if (b & 0x80) != 0
           shift += 7
+          value += 1 << shift
         end
         value
       end

data/lib/gemba/settings/system_tab.rb

@@ -25,6 +25,7 @@ module Gemba
       RA_FEEDBACK_LABEL = "#{FRAME}.ra_feedback"
       RA_HARDCORE_CHECK        = "#{FRAME}.ra_hardcore_row.check"
       RA_RICH_PRESENCE_CHECK   = "#{FRAME}.ra_rich_presence_row.check"
+      RA_SCREENSHOT_CHECK      = "#{FRAME}.ra_screenshot_row.check"
 
       VAR_BIOS_PATH          = '::gemba_bios_path'
       VAR_SKIP_BIOS          = '::gemba_skip_bios'
@@ -34,7 +35,8 @@ module Gemba
       VAR_RA_HARDCORE        = '::gemba_ra_hardcore'
       VAR_RA_UNOFFICIAL      = '::gemba_ra_unofficial'
       VAR_RA_PASSWORD        = '::gemba_ra_password'
-      VAR_RA_RICH_PRESENCE   = '::gemba_ra_rich_presence'
+      VAR_RA_RICH_PRESENCE      = '::gemba_ra_rich_presence'
+      VAR_RA_SCREENSHOT         = '::gemba_ra_screenshot_on_unlock'
 
       RA_UNOFFICIAL_CHECK = "#{FRAME}.ra_unofficial_row.check"
 
@@ -69,7 +71,8 @@ module Gemba
         @app.set_variable(VAR_RA_USERNAME,       config.ra_username.to_s)
         @app.set_variable(VAR_RA_HARDCORE,       config.ra_hardcore?       ? '1' : '0')
         @app.set_variable(VAR_RA_UNOFFICIAL,     config.ra_unofficial?     ? '1' : '0')
-        @app.set_variable(VAR_RA_RICH_PRESENCE,  config.ra_rich_presence?  ? '1' : '0')
+        @app.set_variable(VAR_RA_RICH_PRESENCE,   config.ra_rich_presence?        ? '1' : '0')
+        @app.set_variable(VAR_RA_SCREENSHOT,      config.ra_screenshot_on_unlock? ? '1' : '0')
         @app.set_variable(VAR_RA_PASSWORD, '')
 
         @presenter&.dispose
@@ -85,7 +88,8 @@ module Gemba
         config.ra_username       = @presenter ? @presenter.username : @app.get_variable(VAR_RA_USERNAME).to_s.strip
         config.ra_token          = @presenter ? @presenter.token    : ''
         config.ra_hardcore       = @app.get_variable(VAR_RA_HARDCORE)       == '1'
-        config.ra_rich_presence  = @app.get_variable(VAR_RA_RICH_PRESENCE)  == '1'
+        config.ra_rich_presence        = @app.get_variable(VAR_RA_RICH_PRESENCE) == '1'
+        config.ra_screenshot_on_unlock = @app.get_variable(VAR_RA_SCREENSHOT)    == '1'
         # Password is never persisted — ephemeral field only
       end
 
@@ -252,6 +256,17 @@ module Gemba
           command: proc { @mark_dirty.call })
         @app.command(:pack, RA_RICH_PRESENCE_CHECK, side: :left)
 
+        # Screenshot on achievement unlock (per-game)
+        ss_row = "#{FRAME}.ra_screenshot_row"
+        @app.command('ttk::frame', ss_row)
+        @app.command(:pack, ss_row, fill: :x, padx: 10, pady: [0, 4])
+        @app.set_variable(VAR_RA_SCREENSHOT, '1')
+        @app.command('ttk::checkbutton', RA_SCREENSHOT_CHECK,
+          text: translate('settings.ra_screenshot_on_unlock'),
+          variable: VAR_RA_SCREENSHOT,
+          command: proc { @mark_dirty.call })
+        @app.command(:pack, RA_SCREENSHOT_CHECK, side: :left)
+
         # TODO: hardcore mode — not yet wired up, hidden until ready
         # hardcore_row = "#{FRAME}.ra_hardcore_row"
         # @app.command('ttk::frame', hardcore_row)

data/lib/gemba/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gemba
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/test/shared/tk_test_helper.rb

@@ -123,6 +123,7 @@ module TeekTestHelper
     env['VISUAL'] = '1' if ENV['VISUAL']
     env['COVERAGE'] = '1' if ENV['COVERAGE']
     env['GEMBA_BGERROR_LOG'] = bgerror_path
+    env['GEMBA_CONFIG_DIR'] = Dir.mktmpdir('gemba-test-config')
 
     # -rbundler/setup activates Bundler in the subprocess so path: gems
     # (e.g. teek, teek-sdl2 from sibling repos) are on the load path.

data/test/support/fake_requester.rb

@@ -37,22 +37,32 @@ class FakeRequester
   attr_reader :requests
 
   def initialize
-    @stubs    = {}   # r_string => [json_or_nil, ok_bool]
+    @stubs    = {}   # r_string => Array<[json_or_nil, ok_bool]>
     @requests = []   # all params hashes, in call order
   end
 
   # Register a canned response for a given r= value.
+  # Overwrites any previous stub — the response is reused for every call
+  # until replaced. Use stub_queue for ordered sequential responses.
   def stub(r:, body: nil, ok: true)
-    @stubs[r.to_s] = [body, ok]
+    @stubs[r.to_s] = [[body, ok]]
+  end
+
+  # Enqueue an additional response for a given r= value.
+  # Each queued entry is consumed once; the last entry is reused once exhausted.
+  def stub_queue(r:, body: nil, ok: true)
+    (@stubs[r.to_s] ||= []) << [body, ok]
   end
 
   # Called by ra_request with the same signature as Teek::BackgroundWork.new.
   # Ignores the block (which contains real Net::HTTP code) and returns a
   # Result that fires on_progress synchronously with the canned response.
-  def call(_app, params, mode: nil, **_opts, &_block)
+  def call(_app, params, mode: nil, worker: nil, **_opts, &_block)
     @requests << params.dup
     r      = (params[:r] || params["r"]).to_s
-    result = @stubs.fetch(r, [nil, false])
+    queue  = @stubs.fetch(r, [[nil, false]])
+    result = queue.size > 1 ? queue.shift : queue.first
+    result = [result[1] ? true : false, params[:a].to_s] if worker
     Result.new(result)
   end
 

data/test/test_config.rb

@@ -746,7 +746,8 @@ class TestMGBAConfig < Minitest::Test
 
   def test_per_game_settings_constant_keys
     expected = %w[scale pixel_filter integer_scale color_correction frame_blending
-                  volume muted turbo_speed quick_save_slot save_state_backup ra_rich_presence]
+                  volume muted turbo_speed quick_save_slot save_state_backup ra_rich_presence
+                  ra_screenshot_on_unlock]
     assert_equal expected.sort, Gemba::Config::PER_GAME_SETTINGS.keys.sort
   end
 

data/test/test_game_picker_frame.rb

@@ -22,13 +22,13 @@ class TestGamePickerFrame < Minitest::Test
       picker.show
 
       16.times do |i|
-        title = app.command(".game_picker.card#{i}.title", :cget, '-text')
+        title = app.command(".game_picker.cards.card#{i}.title", :cget, '-text')
         assert_equal '', title, "Card #{i} title should be empty"
 
-        img = app.command(".game_picker.card#{i}.img", :cget, '-image')
+        img = app.command(".game_picker.cards.card#{i}.img", :cget, '-image')
         assert_equal 'boxart_placeholder', img, "Card #{i} should show placeholder image"
 
-        bg = app.command(".game_picker.card#{i}", :cget, '-bg')
+        bg = app.command(".game_picker.cards.card#{i}", :cget, '-bg')
         refute_equal '#2a2a2a', bg, "Card #{i} should not have populated background"
       end
 
@@ -47,8 +47,8 @@ class TestGamePickerFrame < Minitest::Test
       picker = Gemba::GamePickerFrame.new(app: app, rom_library: lib)
       picker.show
 
-      assert_equal 'Pokemon - Ruby Version (USA, Europe)', app.command('.game_picker.card0.title', :cget, '-text')
-      assert_equal 'GBA',          app.command('.game_picker.card0.plat',  :cget, '-text')
+      assert_equal 'Pokemon - Ruby Version (USA, Europe)', app.command('.game_picker.cards.card0.title', :cget, '-text')
+      assert_equal 'GBA',          app.command('.game_picker.cards.card0.plat',  :cget, '-text')
 
       picker.cleanup
       app.command(:destroy, '.game_picker') rescue nil
@@ -64,7 +64,7 @@ class TestGamePickerFrame < Minitest::Test
       picker = Gemba::GamePickerFrame.new(app: app, rom_library: lib)
       picker.show
 
-      assert_equal 'GBC', app.command('.game_picker.card0.plat', :cget, '-text')
+      assert_equal 'GBC', app.command('.game_picker.cards.card0.plat', :cget, '-text')
 
       picker.cleanup
       app.command(:destroy, '.game_picker') rescue nil
@@ -80,7 +80,7 @@ class TestGamePickerFrame < Minitest::Test
       picker = Gemba::GamePickerFrame.new(app: app, rom_library: lib)
       picker.show
 
-      assert_equal 'MY-ROM', app.command('.game_picker.card0.title', :cget, '-text')
+      assert_equal 'MY-ROM', app.command('.game_picker.cards.card0.title', :cget, '-text')
 
       picker.cleanup
       app.command(:destroy, '.game_picker') rescue nil
@@ -96,8 +96,8 @@ class TestGamePickerFrame < Minitest::Test
       picker = Gemba::GamePickerFrame.new(app: app, rom_library: lib)
       picker.show
 
-      pop_bg    = app.command('.game_picker.card0', :cget, '-bg')
-      hollow_bg = app.command('.game_picker.card1', :cget, '-bg')
+      pop_bg    = app.command('.game_picker.cards.card0', :cget, '-bg')
+      hollow_bg = app.command('.game_picker.cards.card1', :cget, '-bg')
 
       assert_equal '#2a2a2a', pop_bg, "Populated card background"
       refute_equal pop_bg, hollow_bg, "Hollow card should differ from populated"
@@ -119,11 +119,11 @@ class TestGamePickerFrame < Minitest::Test
       picker = Gemba::GamePickerFrame.new(app: app, rom_library: lib)
       picker.show
 
-      assert_equal 'Alpha', app.command('.game_picker.card0.title', :cget, '-text')
-      assert_equal 'GBA',   app.command('.game_picker.card0.plat',  :cget, '-text')
-      assert_equal 'Beta',  app.command('.game_picker.card1.title', :cget, '-text')
-      assert_equal 'GBC',   app.command('.game_picker.card1.plat',  :cget, '-text')
-      assert_equal '',      app.command('.game_picker.card2.title', :cget, '-text')
+      assert_equal 'Alpha', app.command('.game_picker.cards.card0.title', :cget, '-text')
+      assert_equal 'GBA',   app.command('.game_picker.cards.card0.plat',  :cget, '-text')
+      assert_equal 'Beta',  app.command('.game_picker.cards.card1.title', :cget, '-text')
+      assert_equal 'GBC',   app.command('.game_picker.cards.card1.plat',  :cget, '-text')
+      assert_equal '',      app.command('.game_picker.cards.card2.title', :cget, '-text')
 
       picker.cleanup
       app.command(:destroy, '.game_picker') rescue nil
@@ -154,7 +154,7 @@ class TestGamePickerFrame < Minitest::Test
       picker = Gemba::GamePickerFrame.new(app: app, rom_library: lib, boxart_fetcher: fetcher)
       picker.show
 
-      img_name = app.command('.game_picker.card0.img', :cget, '-image')
+      img_name = app.command('.game_picker.cards.card0.img', :cget, '-image')
       assert_equal "boxart_#{game_code}", img_name,
         "Card should display cached boxart image, not the placeholder"
 
@@ -175,7 +175,7 @@ class TestGamePickerFrame < Minitest::Test
       picker = Gemba::GamePickerFrame.new(app: app, rom_library: lib)
       picker.show
 
-      img_name = app.command('.game_picker.card0.img', :cget, '-image')
+      img_name = app.command('.game_picker.cards.card0.img', :cget, '-image')
       assert_equal 'boxart_placeholder', img_name
 
       picker.cleanup
@@ -206,12 +206,12 @@ class TestGamePickerFrame < Minitest::Test
         # Suppress tk_popup so the right-click binding configures menu entries
         # without posting the menu (no platform grab → no blocking app.update).
         override_tk_popup do
-          app.tcl_eval("event generate .game_picker.card0 <Button-3> -x 10 -y 10")
+          app.tcl_eval("event generate .game_picker.cards.card0 <Button-3> -x 10 -y 10")
           app.update
         end
 
         # index 1 = Quick Load
-        state = app.tcl_eval(".game_picker.card0.ctx entrycget 1 -state")
+        state = app.tcl_eval(".game_picker.cards.card0.ctx entrycget 1 -state")
         assert_equal 'disabled', state
 
         picker.cleanup
@@ -246,12 +246,12 @@ class TestGamePickerFrame < Minitest::Test
         app.update
 
         override_tk_popup do
-          app.tcl_eval("event generate .game_picker.card0 <Button-3> -x 10 -y 10")
+          app.tcl_eval("event generate .game_picker.cards.card0 <Button-3> -x 10 -y 10")
           app.update
         end
 
         # index 1 = Quick Load
-        state = app.tcl_eval(".game_picker.card0.ctx entrycget 1 -state")
+        state = app.tcl_eval(".game_picker.cards.card0.ctx entrycget 1 -state")
         assert_equal 'normal', state
 
         picker.cleanup
@@ -290,13 +290,13 @@ class TestGamePickerFrame < Minitest::Test
         app.update
 
         override_tk_popup do
-          app.tcl_eval("event generate .game_picker.card0 <Button-3> -x 10 -y 10")
+          app.tcl_eval("event generate .game_picker.cards.card0 <Button-3> -x 10 -y 10")
           app.update
         end
 
         # Menu was built but not shown — invoke the Quick Load entry directly.
         # index 1 = Quick Load
-        app.tcl_eval(".game_picker.card0.ctx invoke 1")
+        app.tcl_eval(".game_picker.cards.card0.ctx invoke 1")
         app.update
 
         assert_equal rom_path, received[:path]