File tree Expand file tree Collapse file tree 2 files changed +5
-8
lines changed
src/vs/editor/browser/widget Expand file tree Collapse file tree 2 files changed +5
-8
lines changed Original file line number Diff line number Diff line change @@ -1369,7 +1369,7 @@ export class DiffEditorWidget extends Disposable implements editorBrowser.IDiffE
1369
1369
this . _originalDomNode . style . width = splitPoint + 'px' ;
1370
1370
this . _originalDomNode . style . left = '0px' ;
1371
1371
1372
- this . _modifiedDomNode . style . width = ( width - splitPoint ) + 'px' ;
1372
+ this . _modifiedDomNode . style . width = ( width - splitPoint - DiffEditorWidget . ENTIRE_DIFF_OVERVIEW_WIDTH ) + 'px' ;
1373
1373
this . _modifiedDomNode . style . left = splitPoint + 'px' ;
1374
1374
1375
1375
this . _overviewDomElement . style . top = '0px' ;
Original file line number Diff line number Diff line change @@ -252,19 +252,16 @@ export class DiffEditorWidget2 extends DelegatingEditor implements IDiffEditor {
252
252
const sashLeft = this . _sash . read ( reader ) ?. sashLeft . read ( reader ) ;
253
253
254
254
const originalWidth = sashLeft ?? Math . max ( 5 , this . _editors . original . getLayoutInfo ( ) . decorationsLeft ) ;
255
+ const modifiedWidth = width - originalWidth - ( this . _options . renderOverviewRuler . read ( reader ) ? OverviewRulerPart . ENTIRE_DIFF_OVERVIEW_WIDTH : 0 ) ;
255
256
256
257
this . elements . original . style . width = originalWidth + 'px' ;
257
258
this . elements . original . style . left = '0px' ;
258
259
259
- this . elements . modified . style . width = ( width - originalWidth ) + 'px' ;
260
+ this . elements . modified . style . width = modifiedWidth + 'px' ;
260
261
this . elements . modified . style . left = originalWidth + 'px' ;
261
262
262
- this . _editors . original . layout ( { width : originalWidth , height : height } ) ;
263
- this . _editors . modified . layout ( {
264
- width : width - originalWidth -
265
- ( this . _options . renderOverviewRuler . read ( reader ) ? OverviewRulerPart . ENTIRE_DIFF_OVERVIEW_WIDTH : 0 ) ,
266
- height
267
- } ) ;
263
+ this . _editors . original . layout ( { width : originalWidth , height } ) ;
264
+ this . _editors . modified . layout ( { width : modifiedWidth , height } ) ;
268
265
269
266
return {
270
267
modifiedEditor : this . _editors . modified . getLayoutInfo ( ) ,
You can’t perform that action at this time.
0 commit comments