Skip to content

Added Border Radius (Corner Radius) option to Settings > Window menu #1412

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

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

Added Border Radius (Corner Radius) option to Settings > Window menu #1412

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
5c3448a
Added Border Radius (Corner Radius) option to Settings > Window menu
27shutterclicks Oct 8, 2022
71eb417
Merge branch 'main' into main
27shutterclicks Jun 7, 2023
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
9 changes: 7 additions & 2 deletions components/Carbon.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,9 @@ class Carbon extends React.PureComponent {
min-width: inherit;
position: relative;
z-index: 1;
border-radius: 5px;
${config.borderRadius
? `border-radius: ${config.borderRadius};`
: 'border-radius: 5px'};
${config.dropShadow
? `box-shadow: 0 ${config.dropShadowOffsetY} ${config.dropShadowBlurRadius} rgba(0, 0, 0, 0.55)`
: ''};
Expand All @@ -321,7 +323,10 @@ class Carbon extends React.PureComponent {
min-width: inherit;
padding: 18px 18px;
padding-left: 12px;
${config.lineNumbers ? 'padding-left: 12px;' : ''} border-radius: 5px;
${config.lineNumbers ? 'padding-left: 12px;' : ''}
${config.borderRadius
? `border-radius: ${config.borderRadius};`
: 'border-radius: 5px'};
font-family: ${config.fontFamily}, monospace !important;
font-size: ${config.fontSize};
line-height: ${config.lineHeight};
Expand Down
10 changes: 10 additions & 0 deletions components/Settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ function KeyboardShortcut({ trigger, handle }) {
function WindowSettings({
onChange,
windowTheme,
borderRadius,
paddingHorizontal,
paddingVertical,
dropShadow,
Expand All @@ -42,6 +43,14 @@ function WindowSettings({
windowControls={windowControls}
onChange={onChange}
/>
<Slider
label="Corner Radius"
value={borderRadius}
minValue={0}
maxValue={25}
onChange={onChange.bind(null, 'borderRadius')}
/>

<div className="row">
<Slider
label="Padding (vert)"
Expand Down Expand Up @@ -375,6 +384,7 @@ class Settings extends React.PureComponent {
onWidthChanging={this.handleWidthChanging}
onWidthChanged={this.handleWidthChanged}
windowTheme={this.props.windowTheme}
borderRadius={this.props.borderRadius}
paddingHorizontal={this.props.paddingHorizontal}
paddingVertical={this.props.paddingVertical}
dropShadow={this.props.dropShadow}
Expand Down
1 change: 1 addition & 0 deletions lib/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1097,6 +1097,7 @@ export const DEFAULT_SETTINGS = {
backgroundImageSelection: null,
backgroundMode: 'color',
backgroundColor: DEFAULT_BG_COLOR,
borderRadius: '5px',
dropShadow: true,
dropShadowOffsetY: '20px',
dropShadowBlurRadius: '68px',
Expand Down