Text-Block: Bug-Fix + Vectorworks-Style + Edit-Selected

User-Probleme:
1. Floating Eto-Dialog erschien nicht nach GetPoint (Mac-Bug)
2. UI war zu klobig, sollte vectorworks-mässig kompakt sein, "+" als
   kleines Icon-Symbol
3. Selektierten Text aendern war nicht moeglich

Fix 1 — Bug: _floating_input geloescht, ersetzt durch
_prompt_for_text() das Rhino.UI.Dialogs.ShowEditBox benutzt. Nativer
cross-platform Dialog ohne Eto-Modal-Bug. Workflow:
  GetPoint → ShowEditBox → AddText. Funktioniert auf Mac.

Fix 2 — UI: Text-Block kompakt umgebaut.
  Reihe 1: [Font ▼] | [Size m]   (130 + 60 = 196px)
  Reihe 2: [B][I][+] segmented pill (gleiche Breite wie Reihe 1)
"+" ist jetzt kleines add-icon (size 13), kein "+ Text" Label mehr.

Fix 3 — Edit-Selection: neue Funktionen in text_create.py:
- _selected_text_objects(doc) → Liste der selektierten TextEntities
- read_selection_settings(doc) → Settings der ersten Selektion
- apply_settings_to_selection(doc, patch) → wendet font/size/bold/italic
  auf alle selektierten TextEntities an
oberleiste.SET_TEXT_SETTINGS handler appliziert die Aenderung jetzt
ZUSAETZLICH auf die Selection (wenn vorhanden) — UND speichert als
Default. State enthaelt textSelectionSettings, UI nutzt diese als
Anzeige-Werte wenn vorhanden (Werte spiegeln Selektion live).
Visual: Border-Color der Size/Segmented-Pill wird accent wenn Selection
aktiv ist (Hinweis dass Aenderungen auf Selektion wirken).

Sig-Update: textSelectionSettings + lastSetView in last_state_sig damit
State neu gepusht wird wenn sich Selection/View aendert.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
This commit is contained in:
2026-05-21 00:32:16 +02:00
parent 38314bcc6f
commit 6fce00343c
3 changed files with 164 additions and 117 deletions
+14 -3
View File
@@ -931,8 +931,12 @@ class OberleisteBridge(panel_base.BaseBridge):
elif t == "SET_TEXT_SETTINGS":
try:
import text_create
text_create.save_settings(
Rhino.RhinoDoc.ActiveDoc, p.get("settings") or {})
doc = Rhino.RhinoDoc.ActiveDoc
patch = p.get("settings") or {}
text_create.save_settings(doc, patch)
# Wenn TextEntities selektiert: gleiche Aenderung direkt
# auf die selektierten Texte applizieren.
text_create.apply_settings_to_selection(doc, patch)
except Exception as ex:
print("[OBERLEISTE] text settings:", ex)
self._send_state(force=True)
@@ -1183,15 +1187,19 @@ class OberleisteBridge(panel_base.BaseBridge):
except Exception:
info["massePresets"] = []
info["masseActiveId"] = None
# Text-Settings + verfuegbare Fonts (Fonts nur einmal initial)
# Text-Settings + verfuegbare Fonts (Fonts nur einmal initial).
# Wenn TextEntity selektiert ist, deren Settings ergaenzen damit
# die UI die Werte des selektierten Textes spiegelt.
try:
import text_create
info["textSettings"] = text_create.load_settings(doc)
info["textSelectionSettings"] = text_create.read_selection_settings(doc)
if not getattr(self, "_fonts_sent", False):
info["textFonts"] = text_create.available_fonts()
self._fonts_sent = True
except Exception:
info["textSettings"] = {}
info["textSelectionSettings"] = None
# Norden-Rotation fuer N/O/S/W-Buttons
try:
import kamera
@@ -1230,6 +1238,9 @@ class OberleisteBridge(panel_base.BaseBridge):
_names_tuple, _active_comb,
info.get("masseActiveId"),
tuple((p.get("id"), p.get("name")) for p in (info.get("massePresets") or [])),
# textSelectionSettings: dict → tuple fuer sig-Vergleich
tuple(sorted((info.get("textSelectionSettings") or {}).items())) if info.get("textSelectionSettings") else None,
info.get("lastSetView"),
prompt,
)
if not force and sig == self._last_state_sig:
+83 -60
View File
@@ -72,69 +72,20 @@ def available_fonts():
return ["Helvetica", "Arial", "Times New Roman", "Courier New"]
def _floating_input():
"""Modal Eto-Dialog mit TextBox bei der Maus-Position. Returns
eingegebenen Text oder None (Escape/leer)."""
import Eto.Forms as forms
import Eto.Drawing as drawing
dlg = forms.Dialog()
dlg.Title = "Text"
dlg.Resizable = False
dlg.MinimumSize = drawing.Size(280, 0)
dlg.Padding = drawing.Padding(6)
tb = forms.TextBox()
tb.PlaceholderText = "Text eingeben — Enter = einfuegen, Esc = abbrechen"
tb.Font = drawing.Font("Helvetica", 13)
tb.Width = 280
result = {"text": None, "committed": False}
def on_keydown(sender, e):
if e.Key == forms.Keys.Enter:
result["text"] = tb.Text or ""
result["committed"] = True
try: dlg.Close()
except Exception: pass
e.Handled = True
elif e.Key == forms.Keys.Escape:
try: dlg.Close()
except Exception: pass
e.Handled = True
tb.KeyDown += on_keydown
layout = forms.StackLayout()
layout.Padding = drawing.Padding(0)
layout.Items.Add(tb)
dlg.Content = layout
# Bei Maus-Cursor positionieren (Position wo User gerade geklickt hat)
def _prompt_for_text(default=""):
"""Nativer Rhino-Dialog fuer Text-Eingabe via ShowEditBox. Wirkt
cross-platform (Mac+Windows), kein Eto-Modal-Bug. Returns text oder
None bei Abbruch/leer."""
try:
m = forms.Mouse.Position
dlg.Location = drawing.Point(int(m.X) + 10, int(m.Y) + 12)
except Exception: pass
# ShowModal blockiert bis Close. Parent = Rhinos Main-Window damit
# der Dialog ueber dem Viewport rendert (Mac).
try:
parent = Rhino.UI.RhinoEtoApp.MainWindow
except Exception:
parent = None
try:
if parent is not None:
dlg.ShowModal(parent)
else:
dlg.ShowModal()
rc, text = Rhino.UI.Dialogs.ShowEditBox(
"Text", "Text:", default or "", False)
if not rc: return None
text = (text or "").strip()
return text or None
except Exception as ex:
print("[TEXT] dialog show:", ex)
print("[TEXT] ShowEditBox:", ex)
return None
if not result["committed"]: return None
txt = (result["text"] or "").strip()
return txt or None
def _apply_font(te, face, bold, italic):
"""Setzt Font auf TextEntity. Mehrere Fallback-Pfade fuer
@@ -162,6 +113,78 @@ def _apply_font(te, face, bold, italic):
return False
def _selected_text_objects(doc):
"""Liefert Liste der selektierten TextEntity-Objekte."""
out = []
if doc is None: return out
try:
for obj in doc.Objects.GetSelectedObjects(False, False):
try:
if isinstance(obj.Geometry, rg.TextEntity):
out.append(obj)
except Exception: pass
except Exception: pass
return out
def apply_settings_to_selection(doc, patch):
"""Wendet font/size/bold/italic auf alle selektierten TextEntities an.
Returns Anzahl der geaenderten Objekte."""
if doc is None or not isinstance(patch, dict): return 0
selected = _selected_text_objects(doc)
if not selected: return 0
n = 0
for obj in selected:
try:
te = obj.Geometry.Duplicate()
if "size" in patch:
try: te.TextHeight = float(patch["size"])
except Exception: pass
# Font: bei jeder Aenderung neu setzen (face+bold+italic kombiniert)
if any(k in patch for k in ("font", "bold", "italic")):
cur = te.Font
try: cur_face = cur.QuartetName if cur else "Helvetica"
except Exception: cur_face = "Helvetica"
try: cur_bold = bool(cur.Bold) if cur else False
except Exception: cur_bold = False
try: cur_italic = bool(cur.Italic) if cur else False
except Exception: cur_italic = False
face = patch.get("font") or cur_face
bold = patch["bold"] if "bold" in patch else cur_bold
italic = patch["italic"] if "italic" in patch else cur_italic
_apply_font(te, face, bool(bold), bool(italic))
doc.Objects.Replace(obj.Id, te)
n += 1
except Exception as ex:
print("[TEXT] apply selection:", ex)
if n > 0:
try: doc.Views.Redraw()
except Exception: pass
return n
def read_selection_settings(doc):
"""Wenn TextEntities selektiert: liefert die Settings des ersten als
dict (font/size/bold/italic). Sonst None."""
sel = _selected_text_objects(doc)
if not sel: return None
try:
te = sel[0].Geometry
font = te.Font
face = font.QuartetName if font else "Helvetica"
bold = bool(font.Bold) if font else False
italic = bool(font.Italic) if font else False
return {
"font": face,
"size": float(te.TextHeight),
"bold": bold,
"italic": italic,
}
except Exception as ex:
print("[TEXT] read selection:", ex)
return None
def create_text():
"""Triggered von der Oberleiste. Vollstaendiger Workflow."""
doc = Rhino.RhinoDoc.ActiveDoc
@@ -173,7 +196,7 @@ def create_text():
if rc != Rhino.Commands.Result.Success: return
if pt is None: return
text = _floating_input()
text = _prompt_for_text()
if not text: return
try:
+51 -38
View File
@@ -272,6 +272,7 @@ export default function OberleisteApp() {
layerCombinations: [], layerCombinationActive: null,
massePresets: [], masseActiveId: null,
textSettings: { font: 'Helvetica', size: 0.20, bold: false, italic: false },
textSelectionSettings: null,
textFonts: [],
northAngle: 0,
lastSetView: null,
@@ -779,39 +780,46 @@ export default function OberleisteApp() {
<div style={sep} />
{/* ====== TEXT-Block 2-Reihen ======
Reihe 1: Font-Dropdown + Groesse (mm)
Reihe 2: B/I-Toggles + "Text einfuegen"-Button
{/* ====== TEXT-Block (Vectorworks-Stil) ======
Reihe 1: Font-Dropdown | Size + "m"
Reihe 2: B/I/+ kompakte Segmented-Pill
Wenn TextEntity selektiert: Werte spiegeln Selektion, Aenderungen
applizieren AUF die Selektion + speichern als Default.
*/}
{(() => {
const ts = state.textSettings || {}
const sel = state.textSelectionSettings // null wenn nichts selektiert
const ts = sel || state.textSettings || {}
const fonts = state.textFonts || []
const updateTs = (patch) => setTextSettings({ ...ts, ...patch })
const TEXT_W = 150
const FONT_W = 130
const SIZE_W = 60
const SEG_W = FONT_W + 6 + SIZE_W // B/I/+ Pill spannt ueber beide Spalten in Row 2
const ACTIVE_BORDER = sel ? 'var(--accent)' : 'var(--border)'
return (
<div style={{
display: 'grid', gridTemplateColumns: 'auto auto', gap: '4px 6px',
alignItems: 'center', flexShrink: 0,
display: 'grid', gridTemplateColumns: `${FONT_W}px ${SIZE_W}px`,
gap: '4px 6px', alignItems: 'center', flexShrink: 0,
}}>
{/* Reihe 1, Spalte 1: Font-Dropdown */}
<BarCombo
icon="text_fields"
value={ts.font || ''}
onChange={(v) => updateTs({ font: v })}
width={TEXT_W}
title="Schriftart"
width={FONT_W}
title={sel ? 'Schriftart (auf Selektion appliziert)' : 'Schriftart'}
>
{fonts.length === 0 && <option value=""></option>}
{fonts.map(f => <option key={f} value={f}>{f}</option>)}
</BarCombo>
{/* Reihe 1, Spalte 2: Groesse (mm) */}
{/* Reihe 1, Spalte 2: Size */}
<div style={{
display: 'inline-flex', alignItems: 'center', gap: 4,
height: BAR_H, padding: '0 10px',
display: 'inline-flex', alignItems: 'center', gap: 3,
height: BAR_H + 2, padding: '0 8px', boxSizing: 'border-box',
background: 'var(--bg-input)',
border: '1px solid var(--border)',
border: '1px solid ' + ACTIVE_BORDER,
borderRadius: 999,
flexShrink: 0, width: 90,
flexShrink: 0, width: SIZE_W,
transition: 'border-color 0.15s',
}}>
<input
type="number" step="0.01" min="0.01"
@@ -825,19 +833,22 @@ export default function OberleisteApp() {
background: 'transparent', border: 'none', outline: 'none',
color: 'var(--text-primary)',
fontSize: 11, fontFamily: 'DM Mono, monospace',
padding: 0, textAlign: 'right',
appearance: 'auto',
padding: 0, textAlign: 'right', appearance: 'auto',
}}
title="Texthoehe in Model-Units"
title={sel ? 'Texthoehe (auf Selektion appliziert)' : 'Texthoehe (m)'}
/>
<span style={{ fontSize: 9, color: 'var(--text-muted)' }}>m</span>
</div>
{/* Reihe 2, Spalte 1: B/I-Toggles */}
{/* Reihe 2: B / I / + in einem Segmented-Pill */}
<div style={{
display: 'inline-flex',
border: '1px solid var(--border)', borderRadius: 999,
overflow: 'hidden', flexShrink: 0, width: TEXT_W,
gridColumn: '1 / span 2',
display: 'inline-flex', justifySelf: 'start',
border: '1px solid ' + ACTIVE_BORDER,
borderRadius: 999, overflow: 'hidden', flexShrink: 0,
width: SEG_W, height: BAR_H + 2, boxSizing: 'border-box',
transition: 'border-color 0.15s',
}}>
{/* B */}
<button
onClick={() => updateTs({ bold: !ts.bold })}
onMouseEnter={(e) => {
@@ -851,15 +862,18 @@ export default function OberleisteApp() {
e.currentTarget.style.color = 'var(--text-primary)'
}}
style={{
flex: 1, height: BAR_H,
flex: 1, height: '100%',
background: ts.bold ? 'var(--accent)' : 'var(--bg-input)',
color: ts.bold ? 'var(--bg-panel)' : 'var(--text-primary)',
border: 'none', cursor: 'pointer',
fontWeight: 700, fontSize: 11,
appearance: 'none', WebkitAppearance: 'none',
lineHeight: 1, padding: 0,
transition: 'background 0.15s, color 0.15s',
}}
title="Fett"
title={(sel ? 'Fett auf Selektion' : 'Fett') + ' (Default)'}
>B</button>
{/* I */}
<button
onClick={() => updateTs({ italic: !ts.italic })}
onMouseEnter={(e) => {
@@ -873,47 +887,46 @@ export default function OberleisteApp() {
e.currentTarget.style.color = 'var(--text-primary)'
}}
style={{
flex: 1, height: BAR_H,
flex: 1, height: '100%',
background: ts.italic ? 'var(--accent)' : 'var(--bg-input)',
color: ts.italic ? 'var(--bg-panel)' : 'var(--text-primary)',
border: 'none', borderLeft: '1px solid var(--border)',
cursor: 'pointer',
fontStyle: 'italic', fontSize: 11,
appearance: 'none', WebkitAppearance: 'none',
lineHeight: 1, padding: 0,
transition: 'background 0.15s, color 0.15s',
}}
title="Kursiv"
title={(sel ? 'Kursiv auf Selektion' : 'Kursiv') + ' (Default)'}
>I</button>
</div>
{/* Reihe 2, Spalte 2: "Text einfuegen" Button */}
{/* + Neuen Text einfuegen */}
<button
onClick={() => createText()}
onMouseEnter={(e) => {
e.currentTarget.style.background = 'var(--bg-item-hover)'
e.currentTarget.style.borderColor = 'var(--accent)'
e.currentTarget.style.color = 'var(--accent-light)'
}}
onMouseLeave={(e) => {
e.currentTarget.style.background = 'var(--bg-input)'
e.currentTarget.style.borderColor = 'var(--border)'
e.currentTarget.style.color = 'var(--text-primary)'
}}
style={{
width: 90, height: BAR_H,
flex: 1, height: '100%',
background: 'var(--bg-input)',
color: 'var(--text-primary)',
border: '1px solid var(--border)',
borderRadius: 999,
border: 'none', borderLeft: '1px solid var(--border)',
cursor: 'pointer',
appearance: 'none', WebkitAppearance: 'none',
lineHeight: 1, padding: 0,
display: 'inline-flex', alignItems: 'center', justifyContent: 'center',
gap: 4, cursor: 'pointer',
fontSize: 11, fontWeight: 500,
transition: 'background 0.15s, color 0.15s, border-color 0.15s',
transition: 'background 0.15s, color 0.15s',
}}
title="Position picken Text tippen → Enter"
title="Neuen Text einfuegen — Position picken, Text eingeben"
>
<Icon name="add" size={12} />
Text
<Icon name="add" size={13} />
</button>
</div>
</div>
)
})()}