arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-07-30 16:24:09 +03:00
Code Activity

Merge branch 'master' of github.com:arduino/Arduino into LUFA_bootloader

Browse Source
This commit is contained in:
Zach Eveland
2012-03-14 15:40:29 -04:00
parent 15bd28d495 7f11df115d
commit d169114205
6 changed files with 147 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/processing/app/EditorListener.java
View File

@ -122,6 +122,14 @@ public class EditorListener {
}
}
if ((event.getModifiers() & KeyEvent.CTRL_MASK) != 0) {
// Consume ctrl-m(carriage return) keypresses
if (code == KeyEvent.VK_M) {
event.consume(); // does nothing
return false;
}
}
if ((event.getModifiers() & KeyEvent.META_MASK) != 0) {
//event.consume(); // does nothing
return false;

5
app/src/processing/app/syntax/TextAreaPainter.java
View File

@ -515,7 +515,10 @@ implements TabExpander, Printable
*/
public Dimension getMinimumSize()
{
return getPreferredSize();
Dimension dim = new Dimension();
dim.width = fm.charWidth('w') * 10;
dim.height = fm.getHeight() * 4;
return dim;
}
// package-private members