dtourolle/DarkRoom
1
0
Fork 0
Code Issues 39 Pull Requests Actions Packages Projects Releases 20 Wiki Activity

Give the strip a layout to sit in
Build and test / Desktop (Linux) (push) Failing after 46s
Details
Build and test / Layer separation (push) Successful in 26s
Details
Traceability / Requirement traces (push) Failing after 1m2s
Details
🐳 Android image / Build and push (push) Successful in 2s
Details
Build and test / android-image (push) Successful in 3s
Details
Build and test / Android (aarch64) (push) Failing after 9m38s
Details

Browse Source 
The develop column's panel is a Rectangle, not a layout — a note four lines
above explains why it is not an `if`. Two children of one therefore both sit
at its origin, so pinning the strip beside the Flickable overlapped them and
collapsed the whole develop view to a sliver.

Wrapped in a VerticalLayout. The strip is pinned by being outside the
Flickable rather than by any coordinate, which is what keeps it working at
any column height.

Caught by screenshotting the device rather than by the build, which was
clean throughout — a Slint layout fault is invisible in the source and
obvious the moment anyone looks.
This commit is contained in:
dtourolle
2026-08-22 10:57:08 +02:00
parent 9a7b045df4
commit 586698db00
1 changed files with 143 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ui/dr-ui/ui/app.slint
+143 -138
View File
@@ -1839,156 +1839,161 @@ in property <bool> panel-visible: true;
// the column instead. // the column instead.
// Pinned: the strip is how the column is navigated, so it // Pinned: the strip is how the column is navigated, so it
// cannot be somewhere you have to navigate to. // cannot be somewhere you have to navigate to.
GroupStrip { // A layout, because the parent is a Rectangle: two children of one
enabled: root.adjust-enabled; // would both sit at its origin and overlap. The strip is pinned by
tabs: root.adjust-tabs; // being outside the Flickable rather than by any coordinate.
active-tab: root.adjust-active-tab; VerticalLayout {
picked(i) => { root.adjust-tab-picked(i); } GroupStrip {
}
Flickable {
viewport-height: column.preferred-height;
interactive: !adjust.slider-dragging;
column := VerticalLayout {
InfoPanel {
camera: root.camera;
exposure: root.exposure;
dimensions: root.dimensions;
}
Rectangle {
height: 1px;
background: Theme.rule;
}
// Directly under the capture metadata and above every
// control, because it is the thing the controls are
// judged against: exposure, blacks and whites are all
// set by watching this move (FR-DSP-7). An instrument
// below the sliders it reports on would have the
// photographer looking away from it to use it.
HistogramPanel {
data: root.histogram;
}
Rectangle {
height: 1px;
background: Theme.rule;
}
// Framing above the colour work, matching how the edit is
// made rather than how it is applied: the frame is decided
// by eye first and the pipeline runs it last (see
// `dr_pipeline::framing` on the coordinate order).
GeometryPanel {
enabled: root.adjust-enabled; enabled: root.adjust-enabled;
crop-mode: root.crop-mode; tabs: root.adjust-tabs;
angle: root.straighten; active-tab: root.adjust-active-tab;
max-straighten: root.max-straighten; picked(i) => { root.adjust-tab-picked(i); }
flip-h: root.flip-h;
flip-v: root.flip-v;
modified: root.framing-modified;
crop-toggled(on) => { root.crop-mode-toggled(on); }
rotate(turns) => { root.rotate-quarters(turns); }
flip-h-toggled => { root.flip-h-toggled(); }
flip-v-toggled => { root.flip-v-toggled(); }
angle-changed(v) => { root.straighten-changed(v); }
angle-reset => { root.straighten-changed(0); }
reset => { root.framing-reset(); }
} }
Rectangle { Flickable {
height: 1px; viewport-height: column.preferred-height;
background: Theme.rule; interactive: !adjust.slider-dragging;
}
// Between the framing and the colour work, because it column := VerticalLayout {
// acts on both: a paste is about the whole edit, and InfoPanel {
// burying it under thirty sliders would put the one camera: root.camera;
// control that operates on all of them below all of exposure: root.exposure;
// them. dimensions: root.dimensions;
TransferPanel { }
enabled: root.adjust-enabled;
armed: root.settings-armed;
summary: root.settings-summary;
framing-withheld: root.settings-framing-withheld;
copy => { root.copy-settings(); }
paste => { root.paste-settings(); }
}
Rectangle { Rectangle {
height: 1px; height: 1px;
background: Theme.rule; background: Theme.rule;
} }
// Above the adjust panel, because it decides what // Directly under the capture metadata and above every
// those sliders act on. Below it, the photographer // control, because it is the thing the controls are
// would set an exposure and only then discover which // judged against: exposure, blacks and whites are all
// scope it landed in. // set by watching this move (FR-DSP-7). An instrument
MaskPanel { // below the sliders it reports on would have the
enabled: root.adjust-enabled; // photographer looking away from it to use it.
masks: root.mask-rows; HistogramPanel {
subjects: root.subject-rows; data: root.histogram;
segmented: root.segmented; }
segmenting: root.segmenting;
overlay: root.overlay-on;
picking: root.region-picking;
editing-mask: root.editing-mask;
segment => { root.segment-image(); } Rectangle {
overlay-toggled(on) => { root.overlay-toggled(on); } height: 1px;
picking-toggled(on) => { root.region-picking-toggled(on); } background: Theme.rule;
mask-selected(id) => { root.mask-selected(id); }
mask-removed(id) => { root.mask-removed(id); }
mask-toggled(id, on) => { root.mask-toggled(id, on); }
mask-invert-toggled(id, on) => {
root.mask-invert-toggled(id, on);
} }
mask-opacity-changed(id, v) => {
root.mask-opacity-changed(id, v);
}
mask-feather-changed(id, v) => {
root.mask-feather-changed(id, v);
}
mask-falloff-picked(id, i) => {
root.mask-falloff-picked(id, i);
}
mask-morphology-picked(id, i) => {
root.mask-morphology-picked(id, i);
}
mask-morph-radius-changed(id, v) => {
root.mask-morph-radius-changed(id, v);
}
add-gradient(radial) => { root.add-gradient-mask(radial); }
add-subject(i) => { root.add-subject-mask(i); }
}
Rectangle { // Framing above the colour work, matching how the edit is
height: 1px; // made rather than how it is applied: the frame is decided
background: Theme.rule; // by eye first and the pipeline runs it last (see
} // `dr_pipeline::framing` on the coordinate order).
GeometryPanel {
enabled: root.adjust-enabled;
crop-mode: root.crop-mode;
angle: root.straighten;
max-straighten: root.max-straighten;
flip-h: root.flip-h;
flip-v: root.flip-v;
modified: root.framing-modified;
adjust := AdjustPanel { crop-toggled(on) => { root.crop-mode-toggled(on); }
rows: root.adjust-rows; rotate(turns) => { root.rotate-quarters(turns); }
enabled: root.adjust-enabled; flip-h-toggled => { root.flip-h-toggled(); }
curve-samples: root.curve-samples; flip-v-toggled => { root.flip-v-toggled(); }
param-changed(op, param, value) => { angle-changed(v) => { root.straighten-changed(v); }
root.param-changed(op, param, value); angle-reset => { root.straighten-changed(0); }
reset => { root.framing-reset(); }
}
Rectangle {
height: 1px;
background: Theme.rule;
}
// Between the framing and the colour work, because it
// acts on both: a paste is about the whole edit, and
// burying it under thirty sliders would put the one
// control that operates on all of them below all of
// them.
TransferPanel {
enabled: root.adjust-enabled;
armed: root.settings-armed;
summary: root.settings-summary;
framing-withheld: root.settings-framing-withheld;
copy => { root.copy-settings(); }
paste => { root.paste-settings(); }
}
Rectangle {
height: 1px;
background: Theme.rule;
}
// Above the adjust panel, because it decides what
// those sliders act on. Below it, the photographer
// would set an exposure and only then discover which
// scope it landed in.
MaskPanel {
enabled: root.adjust-enabled;
masks: root.mask-rows;
subjects: root.subject-rows;
segmented: root.segmented;
segmenting: root.segmenting;
overlay: root.overlay-on;
picking: root.region-picking;
editing-mask: root.editing-mask;
segment => { root.segment-image(); }
overlay-toggled(on) => { root.overlay-toggled(on); }
picking-toggled(on) => { root.region-picking-toggled(on); }
mask-selected(id) => { root.mask-selected(id); }
mask-removed(id) => { root.mask-removed(id); }
mask-toggled(id, on) => { root.mask-toggled(id, on); }
mask-invert-toggled(id, on) => {
root.mask-invert-toggled(id, on);
}
mask-opacity-changed(id, v) => {
root.mask-opacity-changed(id, v);
}
mask-feather-changed(id, v) => {
root.mask-feather-changed(id, v);
}
mask-falloff-picked(id, i) => {
root.mask-falloff-picked(id, i);
}
mask-morphology-picked(id, i) => {
root.mask-morphology-picked(id, i);
}
mask-morph-radius-changed(id, v) => {
root.mask-morph-radius-changed(id, v);
}
add-gradient(radial) => { root.add-gradient-mask(radial); }
add-subject(i) => { root.add-subject-mask(i); }
}
Rectangle {
height: 1px;
background: Theme.rule;
}
adjust := AdjustPanel {
rows: root.adjust-rows;
enabled: root.adjust-enabled;
curve-samples: root.curve-samples;
param-changed(op, param, value) => {
root.param-changed(op, param, value);
}
param-reset(op, param) => {
root.param-reset(op, param);
}
curve-reset(op) => { root.curve-reset(op); }
// A section's reset and a curve's reset are the same
// action — every parameter of one operation back to
// its default — so they share the one callback rather
// than duplicating a handler that would have to be
// kept in step with it.
op-reset(op) => { root.curve-reset(op); }
reset-all => { root.reset-all(); }
} }
param-reset(op, param) => {
root.param-reset(op, param);
} }
curve-reset(op) => { root.curve-reset(op); }
// A section's reset and a curve's reset are the same
// action — every parameter of one operation back to
// its default — so they share the one callback rather
// than duplicating a handler that would have to be
// kept in step with it.
op-reset(op) => { root.curve-reset(op); }
reset-all => { root.reset-all(); }
}
} }
} }