Skip to content

Commit

Permalink
remove circular dependency, phetsims/chipper#1557
Browse files Browse the repository at this point in the history
  • Loading branch information
zepumph committed Feb 10, 2025
1 parent de1a300 commit 54d105f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
3 changes: 1 addition & 2 deletions js/Screen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ import IOType from '../../tandem/js/types/IOType.js';
import ReferenceIO from '../../tandem/js/types/ReferenceIO.js';
import joist from './joist.js';
import JoistStrings from './JoistStrings.js';
import ScreenIcon from './ScreenIcon.js';
import ScreenIcon, { MINIMUM_HOME_SCREEN_ICON_SIZE } from './ScreenIcon.js';
import ScreenView from './ScreenView.js';
import TModel from './TModel.js';

Expand All @@ -48,7 +48,6 @@ const screenSimPatternStringProperty = JoistStrings.a11y.screenSimPatternStringP
const simScreenStringProperty = JoistStrings.a11y.simScreenStringProperty;

// constants
const MINIMUM_HOME_SCREEN_ICON_SIZE = new Dimension2( 548, 373 );
const MINIMUM_NAVBAR_ICON_SIZE = new Dimension2( 147, 100 );
const NAVBAR_ICON_ASPECT_RATIO = MINIMUM_NAVBAR_ICON_SIZE.width / MINIMUM_NAVBAR_ICON_SIZE.height;
const HOME_SCREEN_ICON_ASPECT_RATIO = MINIMUM_HOME_SCREEN_ICON_SIZE.width / MINIMUM_HOME_SCREEN_ICON_SIZE.height;
Expand Down
5 changes: 3 additions & 2 deletions js/ScreenIcon.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ import Node, { NodeOptions } from '../../scenery/js/nodes/Node.js';
import Rectangle from '../../scenery/js/nodes/Rectangle.js';
import TColor from '../../scenery/js/util/TColor.js';
import joist from './joist.js';
import Screen from './Screen.js';

type SelfOptions = {
size?: Dimension2; // size of the background
Expand All @@ -25,6 +24,8 @@ type SelfOptions = {
stroke?: TColor; // {Color|string} background stroke
};

export const MINIMUM_HOME_SCREEN_ICON_SIZE = new Dimension2( 548, 373 );

export type ScreenIconOptions = SelfOptions & StrictOmit<NodeOptions, 'children'>;

export default class ScreenIcon extends Node {
Expand All @@ -36,7 +37,7 @@ export default class ScreenIcon extends Node {
const options = optionize<ScreenIconOptions, SelfOptions, NodeOptions>()( {

// SelfOptions
size: Screen.MINIMUM_HOME_SCREEN_ICON_SIZE,
size: MINIMUM_HOME_SCREEN_ICON_SIZE,
maxIconWidthProportion: 0.85,
maxIconHeightProportion: 0.85,
fill: 'white',
Expand Down

0 comments on commit 54d105f

Please sign in to comment.