Skip to content

Commit

Permalink
Allow markup in Grid DND feedback widget
Browse files Browse the repository at this point in the history
Drag and drop feedback widget shows the markup as plain text during drag
operation.
Do not escape item text in DND feedback widget if markup is enabled on
Grid.

Bug 579671: [Markup] Drag decoration issue on controls with markups
https://bugs.eclipse.org/bugs/show_bug.cgi?id=579671

Change-Id: I3b7708d9e39140a3e31a19ee414aa64d20b3d57c
  • Loading branch information
ifurnadjiev committed Apr 12, 2022
1 parent d4d5c38 commit 4645849
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions bundles/org.eclipse.rap.rwt/js/rwt/remote/DNDSupport.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*******************************************************************************
* Copyright (c) 2009, 2015 Innoopract Informationssysteme GmbH and others.
* Copyright (c) 2009, 2022 Innoopract Informationssysteme GmbH and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
Expand Down Expand Up @@ -448,7 +448,10 @@ rwt.remote.DNDSupport.prototype = {
widget.setBackgroundColor( backgroundColor );
widget.setTextColor( textColor );
var text = item.getText( config.treeColumn );
widget.setCellContent( 1, rwt.util.Encoding.escapeText( text, false ) );
if( !config.markupEnabled ) {
text = rwt.util.Encoding.escapeText( text, false );
}
widget.setCellContent( 1, text );
widget.setFont( config.font );
}
},
Expand Down

0 comments on commit 4645849

Please sign in to comment.