Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix/overriding split inline policies #1497

Draft
wants to merge 2 commits into
base: main
Choose a base branch
from
Draft

Fix/overriding split inline policies #1497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e00f630
🧰: prevent displaying breakpoints in sidebar when not applicable
merryman May 7, 2024
1fc376a
🧰: do not incrementally extend partitioned policies
merryman May 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lively.ide/studio/controls/component.cp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ export class ComponentControlModel extends PropertySectionModel {
const { autoComponentSelection, hoverComponentSelection, clickComponentSelection } = this.ui;
const pos = this.targetMorph.position;
// the parent is always preserved, since we can not alter the structural inheritance here
if (this.targetMorph.master) {
if (this.targetMorph.master && !this.targetMorph.master.statePartitionedInline) {
const previousMasterConfig = this.targetMorph.master.getConfig() || {};
const bps = previousMasterConfig.breakpoints;
if (bps) bps[0][1] = autoComponentSelection.component;
Expand Down
6 changes: 3 additions & 3 deletions lively.ide/studio/controls/responsive.cp.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ class BreakpointEntryModel extends ViewModel {
}

getBreakpointSpec () {
const store = this.targetStylePolicy?.getBreakpointStore();
const store = !this.targetStylePolicy?.statePartitionedInline && this.targetStylePolicy?.getBreakpointStore();
if (!store) {
return;
}
Expand All @@ -53,7 +53,7 @@ class BreakpointEntryModel extends ViewModel {

update (targetMorph) {
this.targetMorph = targetMorph;
const store = this.targetStylePolicy?.getBreakpointStore();
const store = !this.targetStylePolicy?.statePartitionedInline && this.targetStylePolicy?.getBreakpointStore();
if (!store) return;
const { horizontalPin, verticalPin, configureComponentButton } = this.ui;
const {
Expand Down Expand Up @@ -289,7 +289,7 @@ export class ResponsiveControlModel extends PropertySectionModel {
let bpStore;

while (true) {
bpStore = stylePolicy?.getBreakpointStore();
bpStore = !stylePolicy?.statePartitionedInline && stylePolicy?.getBreakpointStore();
if (bpStore) {
break;
}
Expand Down
Loading