5 files changed, 332 insertions, 166 deletions

diff --git a/gui/Cargo.toml b/gui/Cargo.toml
index a2f4154..a0dfb86 100644
--- a/gui/Cargo.toml
+++ b/gui/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zagan-bet-gui"
-version = "4.1.0"
+version = "4.1.1"
 edition = "2024"
 license = "GPL-3.0-or-later"
 description = "Desktop frontend for zagan-bet"
diff --git a/gui/src/app.rs b/gui/src/app.rs
index fde117a..b5a50b3 100644
--- a/gui/src/app.rs
+++ b/gui/src/app.rs
@@ -10,11 +10,12 @@ use eframe::egui::{
     self, Align, Button, CentralPanel, Color32, Context, Frame, Key, Layout, Margin, Panel,
     RichText, Sense, Stroke, Ui, Vec2, vec2,
 };
-use zagan_bet::client::games::roulette::{Cursor, Direction};
+use zagan_bet::client::games::roulette::Cursor;
 use zagan_bet::client::view::{RoulettePhase, RouletteView};
 use zagan_bet::roulette::{BetTarget, Bets, Outside, WHEEL, color as wheel_color};
 use zagan_bet::version::VERSION;
 
+use crate::roulette::FeltAction;
 use crate::{roulette, theme};
 
 const HEADER_HEIGHT: f32 = 64.0;
@@ -218,10 +219,11 @@ fn sidebar(ui: &mut Ui, demo: &mut Demo) {
 
     ui.label(theme::label("Chip"));
     ui.add_space(theme::SPACE_2);
+    let spinning = demo.phase == RoulettePhase::Spinning;
     ui.horizontal(|ui| {
         ui.spacing_mut().item_spacing.x = theme::SPACE_2;
         for amount in CHIP_SIZES {
-            if chip_button(ui, amount, demo.chip == amount).clicked() {
+            if chip_button(ui, amount, demo.chip == amount, !spinning).clicked() {
                 demo.chip = amount;
             }
         }
@@ -247,80 +249,118 @@ fn sidebar(ui: &mut Ui, demo: &mut Demo) {
     ui.add_space(theme::SPACE_2);
     bet_row(ui, "Total", demo.bets.total());
 
-    ui.add_space(theme::SPACE_3);
-    let spinning = demo.phase == RoulettePhase::Spinning;
-    let spin = Button::new(
-        RichText::new("SPIN")
-            .font(theme::mono(theme::FONT_MONO))
-            .color(theme::BG),
-    )
-    .fill(if spinning {
-        theme::WIN.gamma_multiply(0.45)
-    } else {
-        theme::WIN
-    })
-    .corner_radius(theme::RADIUS_MD)
-    .min_size(vec2(ui.available_width(), 44.0));
-    if ui.add_enabled(!spinning, spin).clicked() {
-        demo.start_spin(ui.ctx());
-    }
+    ui.add_space(theme::SPACE_4);
+    let actions = ui.available_width();
+    let clear_width = 108.0;
+    ui.horizontal(|ui| {
+        ui.spacing_mut().item_spacing.x = theme::SPACE_2;
 
-    ui.add_space(theme::SPACE_2);
-    let clear = Button::new(
-        RichText::new("Clear bets")
-            .font(theme::sans(12.0))
-            .color(theme::TEXT_DIM),
-    )
-    .frame(false);
-    if ui
-        .add_enabled(!demo.bets.is_empty() && !spinning, clear)
-        .clicked()
-    {
-        demo.bets = Bets::default();
-    }
+        let spin = Button::new(
+            RichText::new("SPIN")
+                .font(theme::mono(theme::FONT_MONO))
+                .color(theme::BG),
+        )
+        .fill(if spinning {
+            theme::WIN.gamma_multiply(0.45)
+        } else {
+            theme::WIN
+        })
+        .corner_radius(theme::RADIUS_MD)
+        .min_size(vec2(actions - clear_width - theme::SPACE_2, 44.0));
+        let can_spin = !spinning && !demo.bets.is_empty();
+        if ui.add_enabled(can_spin, spin).clicked() {
+            demo.start_spin(ui.ctx());
+        }
+
+        let clear = Button::new(
+            RichText::new("CLEAR")
+                .font(theme::mono(12.0))
+                .color(theme::TEXT_DIM),
+        )
+        .fill(theme::SURFACE_RAISED)
+        .stroke(Stroke::new(1.0, theme::LINE))
+        .corner_radius(theme::RADIUS_MD)
+        .min_size(vec2(clear_width, 44.0));
+        if ui
+            .add_enabled(!demo.bets.is_empty() && !spinning, clear)
+            .clicked()
+        {
+            demo.begin_placing();
+            demo.bets = Bets::default();
+        }
+    });
 }
 
 fn result_line(ui: &mut Ui, demo: &Demo) {
-    ui.horizontal(|ui| {
-        match (demo.phase, demo.number) {
-            (RoulettePhase::Result, Some(number)) => {
-                ui.label(theme::label("Result"));
-                ui.label(
-                    RichText::new(number.to_string())
-                        .font(theme::mono(15.0))
-                        .color(color_of(number)),
-                );
-                ui.label(
-                    RichText::new(wheel_color(number).to_uppercase())
-                        .font(theme::mono(12.0))
-                        .color(theme::TEXT_DIM),
-                );
-            }
-            (RoulettePhase::Spinning, _) => {
-                ui.label(
-                    RichText::new("SPINNING…")
-                        .font(theme::mono(12.0))
-                        .color(theme::GOLD),
-                );
-            }
-            _ => {
+    ui.horizontal(|ui| match (demo.phase, demo.number) {
+        (RoulettePhase::Result, Some(number)) => {
+            ui.label(theme::label("Result"));
+            ui.label(
+                RichText::new(format!("{number} {}", wheel_color(number).to_uppercase()))
+                    .font(theme::mono(14.0))
+                    .color(color_of(number)),
+            );
+            ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
+                payout(ui, demo);
+            });
+        }
+        (RoulettePhase::Spinning, _) => {
+            ui.label(
+                RichText::new("SPINNING…")
+                    .font(theme::mono(12.0))
+                    .color(theme::GOLD),
+            );
+            ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
                 ui.label(
-                    RichText::new("Place your bets")
-                        .font(theme::sans(12.0))
-                        .color(theme::TEXT_DIM),
+                    RichText::new(format!("{} chips", demo.bets.chips.len()))
+                        .font(theme::mono(10.0))
+                        .color(theme::TEXT_FAINT),
                 );
-            }
+            });
         }
-        ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
+        _ => {
             ui.label(
-                RichText::new(format!("{} chips", demo.bets.chips.len()))
-                    .font(theme::mono(10.0))
-                    .color(theme::TEXT_FAINT),
+                RichText::new("Place your bets")
+                    .font(theme::sans(12.0))
+                    .color(theme::TEXT_DIM),
             );
-        });
+            ui.with_layout(Layout::right_to_left(Align::Center), |ui| {
+                ui.label(
+                    RichText::new(format!("{} chips", demo.bets.chips.len()))
+                        .font(theme::mono(10.0))
+                        .color(theme::TEXT_FAINT),
+                );
+            });
+        }
     });
 }
 
+/// What the round paid, and the net for the spin.
+fn payout(ui: &mut Ui, demo: &Demo) {
+    let winnings = demo.winnings.unwrap_or(0);
+    if winnings == 0 {
+        ui.label(
+            RichText::new("NO WIN")
+                .font(theme::mono(13.0))
+                .color(theme::TEXT_FAINT),
+        );
+        return;
+    }
+
+    let profit = winnings as i64 - demo.spent as i64;
+    ui.label(
+        RichText::new(format!("({})", theme::signed_money(profit)))
+            .font(theme::sans(11.0))
+            .color(if profit >= 0 { theme::WIN } else { theme::LOSS }),
+    );
+    ui.label(
+        RichText::new(theme::money(winnings as i64))
+            .font(theme::mono(15.0))
+            .color(theme::WIN),
+    );
+    ui.label(theme::label("Won"));
+}
+
 fn bet_row(ui: &mut Ui, name: &str, amount: u64) {
     ui.horizontal(|ui| {
         ui.label(
@@ -338,8 +378,13 @@ fn bet_row(ui: &mut Ui, name: &str, amount: u64) {
     });
 }
 
-fn chip_button(ui: &mut Ui, amount: u64, selected: bool) -> egui::Response {
-    let (rect, response) = ui.allocate_exact_size(Vec2::splat(46.0), Sense::click());
+fn chip_button(ui: &mut Ui, amount: u64, selected: bool, enabled: bool) -> egui::Response {
+    let sense = if enabled {
+        Sense::click()
+    } else {
+        Sense::hover()
+    };
+    let (rect, response) = ui.allocate_exact_size(Vec2::splat(46.0), sense);
     let center = rect.center();
     let radius = 20.0;
     let painter = ui.painter();
@@ -350,7 +395,11 @@ fn chip_button(ui: &mut Ui, amount: u64, selected: bool) -> egui::Response {
             Stroke::new(if selected { 2.0 } else { 1.0 }, theme::ACCENT),
         );
     }
-    roulette::paint_chip(painter, center, radius, amount);
+    if enabled {
+        roulette::paint_chip(painter, center, radius, amount);
+    } else {
+        roulette::paint_chip_preview(painter, center, radius, amount);
+    }
     response
 }
 
@@ -395,11 +444,20 @@ fn table(ui: &mut Ui, demo: &mut Demo) {
     let side_pad = ((available.x - size.x) * 0.5).max(0.0);
     let top_pad = ((available.y - size.y - strip_height) * 0.5).max(0.0);
     let chip = demo.chip;
+    let placing = demo.phase != RoulettePhase::Spinning;
     ui.add_space(top_pad);
     ui.horizontal(|ui| {
         ui.add_space(side_pad);
-        if let Some(target) = roulette::felt(ui, size, &view) {
-            demo.bets.add(target, chip);
+        match roulette::felt(ui, size, &view) {
+            Some(FeltAction::Place(target)) if placing => {
+                demo.begin_placing();
+                demo.bets.add(target, chip);
+            }
+            Some(FeltAction::Reduce(target)) if placing => {
+                demo.begin_placing();
+                demo.bets.reduce(&target, chip);
+            }
+            _ => {}
         }
     });
 
@@ -422,7 +480,7 @@ fn table(ui: &mut Ui, demo: &mut Demo) {
     ui.add_space(theme::SPACE_2);
     ui.label(
         RichText::new(
-            "Click a pocket to place a chip  ·  arrow keys move the cursor  ·  space spins",
+            "Click to place  ·  right or middle click takes back  ·  C clears  ·  space spins",
         )
         .font(theme::sans(12.0))
         .color(theme::TEXT_FAINT),
@@ -442,7 +500,6 @@ struct Spin {
 
 struct Demo {
     bets: Bets,
-    cursor: Cursor,
     chip: u64,
     phase: RoulettePhase,
     number: Option<u8>,
@@ -450,6 +507,8 @@ struct Demo {
     spin: Option<Spin>,
     spins: usize,
     last: Vec<u8>,
+    winnings: Option<u64>,
+    spent: u64,
     balance: i64,
     host: &'static str,
     ping_ms: u32,
@@ -471,8 +530,6 @@ impl Demo {
 
         Self {
             bets,
-            // A split with no chip on it, so the fine lattice cursor shows.
-            cursor: Cursor::Lattice { x: 18, y: 3 },
             chip: 25,
             phase: RoulettePhase::Placing,
             number: None,
@@ -480,6 +537,8 @@ impl Demo {
             spin: None,
             spins: 0,
             last: Vec::new(),
+            winnings: None,
+            spent: 0,
             balance: 1000,
             host: "127.0.0.1:11525",
             ping_ms: 41,
@@ -494,15 +553,24 @@ impl Demo {
             balance: Some(self.balance),
             chip: self.chip,
             bets: self.bets.clone(),
-            cursor: self.cursor,
+            cursor: Cursor::default(),
             phase: self.phase,
             number: self.number,
             color: self.number.map(|number| wheel_color(number).to_string()),
-            winnings: None,
+            winnings: self.winnings,
             error: None,
         }
     }
 
+    /// A bet change after a result starts the next round: the wheel stays
+    /// where it stopped, but the payout and the winning highlight do not.
+    fn begin_placing(&mut self) {
+        if self.phase == RoulettePhase::Result {
+            self.phase = RoulettePhase::Placing;
+            self.winnings = None;
+        }
+    }
+
     fn tick(&mut self, ctx: &Context) {
         let now = ctx.input(|input| input.time);
         let mut finished = None;
@@ -519,52 +587,37 @@ impl Demo {
             self.spin = None;
             self.phase = RoulettePhase::Result;
             self.number = Some(number);
+            self.winnings = Some(self.bets.winnings(number));
             self.last.insert(0, number);
             self.last.truncate(12);
         }
     }
 
+    /// Pointer-first: the felt reads the mouse. The keyboard keeps the two
+    /// verbs that have no pointer equivalent in profile (spin and clear).
     fn keys(&mut self, ctx: &Context) {
         if self.phase == RoulettePhase::Spinning {
             return;
         }
-        let (left, right, up, down) = ctx.input(|input| {
-            (
-                input.key_pressed(Key::ArrowLeft),
-                input.key_pressed(Key::ArrowRight),
-                input.key_pressed(Key::ArrowUp),
-                input.key_pressed(Key::ArrowDown),
-            )
-        });
-        for (pressed, direction) in [
-            (left, Direction::Left),
-            (right, Direction::Right),
-            (up, Direction::Up),
-            (down, Direction::Down),
-        ] {
-            if pressed {
-                self.cursor = self.cursor.moved(direction);
-            }
-        }
         if ctx.memory(|memory| memory.focused().is_none()) {
-            if ctx.input(|input| input.key_pressed(Key::Enter)) {
-                if let Some(target) = self.cursor.target() {
-                    let chip = self.chip;
-                    self.bets.add(target, chip);
-                }
-            }
             if ctx.input(|input| input.key_pressed(Key::Space)) {
                 self.start_spin(ctx);
             }
+            if ctx.input(|input| input.key_pressed(Key::C)) {
+                self.begin_placing();
+                self.bets = Bets::default();
+            }
         }
     }
 
     fn start_spin(&mut self, ctx: &Context) {
-        if self.phase == RoulettePhase::Spinning {
+        if self.phase == RoulettePhase::Spinning || self.bets.is_empty() {
             return;
         }
         let target = DEMO_TARGETS[self.spins % DEMO_TARGETS.len()];
         self.spins += 1;
+        self.spent = self.bets.total();
+        self.winnings = None;
 
         let segment = TAU / WHEEL.len() as f32;
         let index = WHEEL
diff --git a/gui/src/roulette.rs b/gui/src/roulette.rs
index 22c46d6..f674251 100644
--- a/gui/src/roulette.rs
+++ b/gui/src/roulette.rs
@@ -7,10 +7,10 @@
 use std::f32::consts::{FRAC_PI_2, TAU};
 
 use eframe::egui::{
-    Align2, Color32, CornerRadius, Painter, Pos2, Rect, Sense, Shape, Stroke, StrokeKind, Ui, Vec2,
-    pos2, vec2,
+    Align2, Color32, CornerRadius, Painter, PointerButton, Pos2, Rect, Sense, Shape, Stroke,
+    StrokeKind, Ui, Vec2, pos2, vec2,
 };
-use zagan_bet::client::games::roulette::Cursor;
+use zagan_bet::client::games::roulette::target_at as lattice_target;
 use zagan_bet::client::view::{RoulettePhase, RouletteView};
 use zagan_bet::roulette::{BetTarget, Outside, WHEEL, color as wheel_color, is_red};
 
@@ -42,18 +42,38 @@ pub fn size_for(available: Vec2) -> Vec2 {
     vec2((COLUMNS as f32 + 1.0) * cell, HEIGHT_UNITS * cell) + Vec2::splat(BOARD_PAD * 2.0)
 }
 
-/// The table painted at `size`; returns the target clicked this frame.
-pub fn felt(ui: &mut Ui, size: Vec2, view: &RouletteView) -> Option<BetTarget> {
+/// What the pointer did to the felt this frame.
+#[derive(Debug, Clone, PartialEq, Eq)]
+pub enum FeltAction {
+    /// Left click: add the selected chip.
+    Place(BetTarget),
+    /// Right or middle click: take one chip back.
+    Reduce(BetTarget),
+}
+
+/// The table painted at `size`; returns the bet the pointer changed.
+pub fn felt(ui: &mut Ui, size: Vec2, view: &RouletteView) -> Option<FeltAction> {
     let (rect, response) = ui.allocate_exact_size(size, Sense::click());
     let felt = Felt::new(rect);
-    let hovered = response.hover_pos().and_then(|pos| felt.hit(pos));
+    let hovered = if view.phase == RoulettePhase::Spinning {
+        None
+    } else {
+        response.hover_pos().and_then(|pos| felt.target_at(pos))
+    };
     let painter = ui.painter();
 
     painter.rect_filled(rect, theme::RADIUS_LG, theme::FELT_DARK);
 
+    // Every cell the hovered bet covers tints, so a split or corner reads
+    // before the chip lands.
+    let covered = hovered.as_ref().map(BetTarget::numbers).unwrap_or_default();
     for number in 0..=36u8 {
-        let highlighted = hovered == Some(BetTarget::Straight { number });
-        felt.paint_number(painter, number, highlighted);
+        felt.paint_number(
+            painter,
+            number,
+            covered.contains(&number),
+            hovered == Some(BetTarget::Straight { number }),
+        );
     }
     for index in 0..3 {
         felt.paint_dozen(
@@ -89,24 +109,38 @@ pub fn felt(ui: &mut Ui, size: Vec2, view: &RouletteView) -> Option<BetTarget> {
         }
     }
 
-    felt.paint_cursor(painter, &view.cursor);
-
     for chip in &view.bets.chips {
         if let Some(center) = felt.anchor(&chip.target) {
-            paint_chip(painter, center, felt.cell * 0.26, chip.amount);
+            paint_chip(painter, center, felt.cell_size() * 0.26, chip.amount);
+        }
+    }
+
+    if let Some(target) = &hovered {
+        if let Some(center) = felt.anchor(target) {
+            paint_chip_preview(painter, center, felt.cell_size() * 0.26, view.chip);
         }
     }
 
-    if response.clicked() { hovered } else { None }
+    if response.clicked_by(PointerButton::Secondary) || response.clicked_by(PointerButton::Middle) {
+        hovered.map(FeltAction::Reduce)
+    } else if response.clicked() {
+        hovered.map(FeltAction::Place)
+    } else {
+        None
+    }
 }
 
-struct Felt {
+/// Geometry of one table: the felt is 13 cells wide (zero plus twelve
+/// columns) and 3 + 0.72 + 0.55 + 0.62 cells tall.
+///
+/// Public so the pointer snapping can be tested without a window.
+pub struct Felt {
     cell: f32,
     origin: Pos2,
 }
 
 impl Felt {
-    fn new(board: Rect) -> Self {
+    pub fn new(board: Rect) -> Self {
         let inner = board.shrink(BOARD_PAD);
         Self {
             cell: inner.width() / (COLUMNS as f32 + 1.0),
@@ -114,7 +148,11 @@ impl Felt {
         }
     }
 
-    fn number_rect(&self, number: u8) -> Rect {
+    pub fn cell_size(&self) -> f32 {
+        self.cell
+    }
+
+    pub fn number_rect(&self, number: u8) -> Rect {
         debug_assert!(number <= 36);
         if number == 0 {
             return Rect::from_min_size(self.origin, vec2(self.cell, self.cell * ROWS as f32));
@@ -138,8 +176,8 @@ impl Felt {
     fn column_rect(&self, index: usize) -> Rect {
         let y = self.origin.y + self.cell * (ROWS as f32 + DOZEN_ROW);
         Rect::from_min_size(
-            pos2(self.origin.x + self.cell * (1.0 + index as f32), y),
-            vec2(self.cell, self.cell * COLUMN_ROW),
+            pos2(self.origin.x + self.cell * (1.0 + 4.0 * index as f32), y),
+            vec2(self.cell * 4.0, self.cell * COLUMN_ROW),
         )
     }
 
@@ -152,7 +190,7 @@ impl Felt {
     }
 
     /// Where a chip sits for this target.
-    fn anchor(&self, target: &BetTarget) -> Option<Pos2> {
+    pub fn anchor(&self, target: &BetTarget) -> Option<Pos2> {
         Some(match target {
             BetTarget::Straight { number } => self.number_rect(*number).center(),
             BetTarget::Split { a, b } => {
@@ -178,20 +216,28 @@ impl Felt {
         })
     }
 
-    /// The fine-grid point the cursor occupies over the numbers.
-    fn lattice(&self, x: usize, y: usize) -> Pos2 {
-        pos2(
-            self.origin.x + self.cell * (1.0 + x as f32 * 0.5),
-            self.origin.y + self.cell * (y as f32 * 0.5),
-        )
+    fn grid_origin(&self) -> Pos2 {
+        self.origin + vec2(self.cell, 0.0)
     }
 
-    fn hit(&self, pos: Pos2) -> Option<BetTarget> {
-        for number in 0..=36u8 {
-            if self.number_rect(number).contains(pos) {
-                return Some(BetTarget::Straight { number });
-            }
+    /// The bet under the pointer, snapped to the fine lattice: a cell centre
+    /// is a straight, a line is a split, a crossing is a corner.
+    pub fn target_at(&self, pos: Pos2) -> Option<BetTarget> {
+        if self.number_rect(0).contains(pos) {
+            return Some(BetTarget::Straight { number: 0 });
+        }
+
+        let grid = self.grid_origin();
+        let fx = (pos.x - grid.x) / self.cell;
+        let fy = (pos.y - grid.y) / self.cell;
+        if (0.0..COLUMNS as f32).contains(&fx) && (0.0..ROWS as f32).contains(&fy) {
+            // Thresholds sit a quarter cell from a centre, so the inner half
+            // of a cell is a straight and its edges are splits or corners.
+            let x = (fx * 2.0).round().clamp(1.0, 23.0) as usize;
+            let y = (fy * 2.0).round().clamp(1.0, 5.0) as usize;
+            return lattice_target(x, y);
         }
+
         for index in 0..3usize {
             if self.dozen_rect(index).contains(pos) {
                 return Some(BetTarget::Dozen { index: index as u8 });
@@ -208,7 +254,7 @@ impl Felt {
         None
     }
 
-    fn paint_number(&self, painter: &Painter, number: u8, hovered: bool) {
+    fn paint_number(&self, painter: &Painter, number: u8, covered: bool, hovered: bool) {
         let rect = self.number_rect(number);
         let fill = if number == 0 {
             theme::ROULETTE_ZERO
@@ -224,7 +270,9 @@ impl Felt {
             Stroke::new(1.0, theme::FELT_LINE),
             StrokeKind::Inside,
         );
-        if hovered {
+        if covered {
+            painter.rect_filled(rect, CornerRadius::ZERO, theme::ACCENT.gamma_multiply(0.16));
+        } else if hovered {
             painter.rect_filled(
                 rect,
                 CornerRadius::ZERO,
@@ -303,28 +351,6 @@ impl Felt {
         }
     }
 
-    fn paint_cursor(&self, painter: &Painter, cursor: &Cursor) {
-        let stroke = Stroke::new(2.0, theme::ACCENT);
-        match cursor {
-            Cursor::Zero => outline(painter, self.number_rect(0), stroke),
-            Cursor::Lattice { x, y } => {
-                for number in cursor.numbers() {
-                    painter.rect_filled(
-                        self.number_rect(number),
-                        CornerRadius::ZERO,
-                        theme::ACCENT.gamma_multiply(0.14),
-                    );
-                }
-                let point = self.lattice(*x, *y);
-                painter.circle_filled(point, self.cell * 0.05, theme::ACCENT);
-                painter.circle_stroke(point, self.cell * 0.14, stroke);
-            }
-            Cursor::Dozen(index) => outline(painter, self.dozen_rect(*index), stroke),
-            Cursor::Column(index) => outline(painter, self.column_rect(*index), stroke),
-            Cursor::Outside(index) => outline(painter, self.outside_rect(*index), stroke),
-        }
-    }
-
     fn number_font(&self) -> f32 {
         (self.cell * 0.40).clamp(12.0, 22.0)
     }
@@ -334,15 +360,6 @@ impl Felt {
     }
 }
 
-fn outline(painter: &Painter, rect: Rect, stroke: Stroke) {
-    painter.rect_stroke(
-        rect.shrink(1.0),
-        theme::RADIUS_SM,
-        stroke,
-        StrokeKind::Inside,
-    );
-}
-
 /// A single chip, also used by the sidebar's chip tray.
 pub fn paint_chip(painter: &Painter, center: Pos2, radius: f32, amount: u64) {
     let fill = chip_color(amount);
@@ -366,6 +383,23 @@ pub fn paint_chip(painter: &Painter, center: Pos2, radius: f32, amount: u64) {
     );
 }
 
+/// The chip under the pointer, showing what a click would add.
+pub fn paint_chip_preview(painter: &Painter, center: Pos2, radius: f32, amount: u64) {
+    painter.circle_filled(center, radius, chip_color(amount).gamma_multiply(0.45));
+    painter.circle_stroke(
+        center,
+        radius,
+        Stroke::new(2.0, Color32::WHITE.gamma_multiply(0.85)),
+    );
+    painter.text(
+        center,
+        Align2::CENTER_CENTER,
+        amount,
+        theme::mono(radius * 0.85),
+        Color32::WHITE,
+    );
+}
+
 /// Colour per denomination, as a chip tray would be stocked.
 pub fn chip_color(amount: u64) -> Color32 {
     match amount {
@@ -444,9 +478,8 @@ pub fn wheel(ui: &mut Ui, diameter: f32, view: &RouletteView, rotation: f32) {
     painter.circle_stroke(center, inner, Stroke::new(1.0, theme::LINE));
 
     let displayed = match view.phase {
-        RoulettePhase::Result => view.number,
         RoulettePhase::Spinning => Some(number_under(rotation)),
-        RoulettePhase::Placing => None,
+        _ => view.number,
     };
     match displayed {
         Some(number) => {
diff --git a/gui/src/theme.rs b/gui/src/theme.rs
index 9270aa6..0e5a475 100644
--- a/gui/src/theme.rs
+++ b/gui/src/theme.rs
@@ -120,6 +120,12 @@ pub fn money(amount: i64) -> String {
     format!("{} Kr", group_digits(amount))
 }
 
+/// Net amount with an explicit sign: `"+800 Kr"`, `"-90 Kr"`.
+pub fn signed_money(amount: i64) -> String {
+    let sign = if amount < 0 { "-" } else { "+" };
+    format!("{sign}{} Kr", group_digits(amount.abs()))
+}
+
 // ---------------------------------------------------------------------------
 // Installation
 // ---------------------------------------------------------------------------
diff --git a/gui/tests/layout.rs b/gui/tests/layout.rs
index e0c0475..ab5a62e 100644
--- a/gui/tests/layout.rs
+++ b/gui/tests/layout.rs
@@ -4,8 +4,9 @@
 
 use std::f32::consts::TAU;
 
+use eframe::egui::{Pos2, Rect, pos2, vec2};
 use zagan_bet::roulette::{BetTarget, Outside};
-use zagan_bet_gui::roulette::{number_under, size_for, target_name};
+use zagan_bet_gui::roulette::{Felt, number_under, size_for, target_name};
 use zagan_bet_gui::theme::{group_digits, money};
 
 #[test]
@@ -49,6 +50,79 @@ fn table_size_keeps_the_felt_aspect_and_fits() {
     assert!((cell - (size.y - 12.0) / 4.89).abs() < 0.01);
 }
 
+fn felt() -> Felt {
+    Felt::new(Rect::from_min_size(
+        Pos2::ZERO,
+        size_for(vec2(1300.0, 900.0)),
+    ))
+}
+
+#[test]
+fn the_pointer_snaps_to_straights_splits_and_corners() {
+    let felt = felt();
+    let cell = felt.cell_size();
+    let center = felt.number_rect(17).center();
+
+    // The inner half of a cell is a straight, even slightly off centre.
+    assert_eq!(
+        felt.target_at(center + vec2(cell * 0.2, 0.0)),
+        Some(BetTarget::Straight { number: 17 })
+    );
+
+    // A quarter cell from the centre is the line: right of 17 is 20, above is 18.
+    assert_eq!(
+        felt.target_at(center + vec2(cell * 0.3, 0.0)),
+        Some(BetTarget::Split { a: 17, b: 20 })
+    );
+    assert_eq!(
+        felt.target_at(center + vec2(0.0, -cell * 0.3)),
+        Some(BetTarget::Split { a: 17, b: 18 })
+    );
+
+    // Near both lines at once is the corner of the four cells.
+    assert_eq!(
+        felt.target_at(center + vec2(cell * 0.3, -cell * 0.3)),
+        Some(BetTarget::Corner {
+            numbers: [17, 18, 20, 21]
+        })
+    );
+
+    // Zero is a straight and nothing else.
+    assert_eq!(
+        felt.target_at(felt.number_rect(0).center()),
+        Some(BetTarget::Straight { number: 0 })
+    );
+}
+
+#[test]
+fn the_pointer_finds_the_wide_bets_below_the_grid() {
+    let felt = felt();
+    let cell = felt.cell_size();
+    let x = felt.number_rect(17).center().x;
+    let grid_bottom = felt.number_rect(16).bottom();
+
+    // 17 sits in the second dozen (13-24).
+    assert_eq!(
+        felt.target_at(pos2(x, grid_bottom + cell * 0.3)),
+        Some(BetTarget::Dozen { index: 1 })
+    );
+
+    // Below the dozens is the column row; 17 is in column 2 (2,5,...,17).
+    assert_eq!(
+        felt.target_at(pos2(x, grid_bottom + cell * (0.72 + 0.3))),
+        Some(BetTarget::Column { index: 1 })
+    );
+
+    // And below that, the outside row: 17's column lands on RED.
+    assert_eq!(
+        felt.target_at(pos2(x, grid_bottom + cell * (0.72 + 0.55 + 0.3))),
+        Some(BetTarget::Outside { kind: Outside::Red })
+    );
+
+    // Outside the board is not a bet.
+    assert_eq!(felt.target_at(pos2(-1.0, -1.0)), None);
+}
+
 #[test]
 fn targets_read_as_bet_slips() {
     assert_eq!(