AI_Assistant/pcbjam
Watch
1
0
Fork
You've already forked pcbjam
 0
Code Issues Pull requests Projects Releases 4 Packages Wiki Activity Actions 2

fix: hollow sheet rooms wiped subsheets on entry (ysync 0011) + hierarchy pane icon sizing/selection colours

Browse source 
Collab: a save-all's layout-only sync into a never-entered sheet room left a
doc with layout but zero items; the first entry adopted it and removed every
item on screen. seed() now file-seeds a hollow doc, syncLayoutFromSave skips
never-seeded empty rooms, and the ydoc-boot / sibling-restage paths fall back
to the file. Tree: new tree-hier standalone app + e2e spec covering the
wxwidgets bundle-size and unfocused-selection fixes.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0189z2siCsezE39ugcDKNBMs
This commit is contained in:
Gergő Törcsvári 2026-08-27 08:58:40 +02:00
commit 8fa6bae084
No known key found for this signature in database
GPG key ID: 8E75F2CDE64E5322
12 changed files with 266 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
tests/apps/Makefile.wasm
View file

@ -180,6 +180,7 @@ all: minimal_test.html \
$(S)/dialog/dialog_test.html \
$(S)/timer/timer_test.html \
$(S)/tree/tree_test.html \
$(S)/tree-hier/tree_hier_test.html \
$(S)/radiogroups/radiogroups_test.html \
$(S)/dataview/dataview_test.html \
$(S)/htmlwin/htmlwin_test.html \
@ -400,6 +401,13 @@ $(S)/tree/tree_test.o: $(S)/tree/tree_test.cpp
$(S)/tree/tree_test.html: $(S)/tree/tree_test.o $(WX_CORE_LIB) $(JS_FILES)
$(CXX) $< $(LDFLAGS_NOGL) --pre-js $(JS) --shell-file $(HTML) -o $@
# Hierarchy-pane-like tree test (no GL): hidden root + images + bold item
$(S)/tree-hier/tree_hier_test.o: $(S)/tree-hier/tree_hier_test.cpp
$(CXX) -c $(CXXFLAGS) $< -o $@
$(S)/tree-hier/tree_hier_test.html: $(S)/tree-hier/tree_hier_test.o $(WX_CORE_LIB) $(JS_FILES)
$(CXX) $< $(LDFLAGS_NOGL) --pre-js $(JS) --shell-file $(HTML) -o $@
# Radio button groups test (no GL) - multiple wxRB_GROUP groups in one window
$(S)/radiogroups/radiogroups_test.o: $(S)/radiogroups/radiogroups_test.cpp
$(CXX) -c $(CXXFLAGS) $< -o $@
@ -808,6 +816,7 @@ grid: $(S)/grid/grid_test.html
dialog: $(S)/dialog/dialog_test.html
timer: $(S)/timer/timer_test.html
tree: $(S)/tree/tree_test.html
tree-hier: $(S)/tree-hier/tree_hier_test.html
radiogroups: $(S)/radiogroups/radiogroups_test.html
dataview: $(S)/dataview/dataview_test.html
htmlwin: $(S)/htmlwin/htmlwin_test.html

80
tests/apps/standalone/tree-hier/tree_hier_test.cpp Normal file
View file

@ -0,0 +1,80 @@
// wxTreeCtrl configured like eeschema's HIERARCHY_PANE: hidden root, buttons,
// per-item images (wxBitmapBundle), bold "current sheet" item, no explicit lines.
// Repro for the mangled hierarchy pane in the wasm port (icon/text misaligned,
// oversized rows, black text on the selection highlight).
#include <wx/wxprec.h>
#ifndef WX_PRECOMP
#include <wx/wx.h>
#endif
#include <wx/treectrl.h>
#include <wx/bmpbndl.h>
#include <wx/dcmemory.h>
#ifdef __EMSCRIPTEN__
#include <emscripten.h>
#endif
static wxBitmap MakeDot(int size, const wxColour& fill)
{
wxBitmap bmp(size, size, 32);
bmp.UseAlpha();
wxMemoryDC dc(bmp);
dc.SetBackground(*wxTRANSPARENT_BRUSH);
dc.Clear();
dc.SetPen(wxPen(fill));
dc.SetBrush(wxBrush(fill));
dc.DrawEllipse(1, 1, size - 2, size - 2);
dc.SelectObject(wxNullBitmap);
return bmp;
}
class HierFrame : public wxFrame
{
public:
HierFrame() : wxFrame(nullptr, wxID_ANY, "Hierarchy tree test", wxDefaultPosition, wxSize(420, 420))
{
wxBoxSizer* sizer = new wxBoxSizer(wxVERTICAL);
m_tree = new wxTreeCtrl(this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
wxTR_HAS_BUTTONS | wxTR_EDIT_LABELS | wxTR_HIDE_ROOT);
wxVector<wxBitmapBundle> images;
// KiCad's tree_nosel/tree_sel are 16px dots (bundle carries 16 + 32 variants).
images.push_back(wxBitmapBundle::FromBitmaps(MakeDot(16, wxColour(160, 160, 160)),
MakeDot(32, wxColour(160, 160, 160))));
images.push_back(wxBitmapBundle::FromBitmaps(MakeDot(16, wxColour(40, 40, 40)),
MakeDot(32, wxColour(40, 40, 40))));
m_tree->SetImages(images);
wxTreeItemId root = m_tree->AddRoot("root");
wxTreeItemId top = m_tree->AppendItem(root, "Arduino Leonardo (page 1)", 0, 1);
m_tree->SetItemBold(top, true);
m_tree->AppendItem(top, "Headers (page 2)", 0, 1);
m_tree->AppendItem(top, "Power (page 3)", 0, 1);
wxTreeItemId mcu = m_tree->AppendItem(top, "ATMEGA32U4-AU (page 4)", 0, 1);
m_tree->AppendItem(mcu, "USB (page 5)", 0, 1);
m_tree->ExpandAll();
m_tree->SelectItem(top);
sizer->Add(m_tree, 1, wxEXPAND);
wxBoxSizer* btns = new wxBoxSizer(wxHORIZONTAL);
wxButton* focusBtn = new wxButton(this, wxID_ANY, "Take focus");
btns->Add(focusBtn, 0, wxALL, 4);
sizer->Add(btns, 0);
SetSizer(sizer);
Layout();
#ifdef __EMSCRIPTEN__
EM_ASM({ console.log('[TREE_HIER_TEST] started'); });
#endif
}
private:
wxTreeCtrl* m_tree;
};
class HierApp : public wxApp
{
public:
bool OnInit() override
{
(new HierFrame())->Show();
return true;
}
};
wxIMPLEMENT_APP(HierApp);