rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2025-02-26 20:54:22 +01:00
Code Issues Releases Activity

[tabs] some heavy lifting on tabs handling

Browse Source 
The situation is still a shit, but at least better than before.
This commit is contained in:
Martino Facchin 2018-01-12 18:28:19 +01:00
parent 56dcf6bde4
commit 336cde194d
1 changed files with 45 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
app/src/processing/app/EditorHeader.java
View File

@ -223,16 +223,7 @@ public class EditorHeader extends JComponent {
Dimension size = getSize(); Dimension size = getSize();
if ((size.width != sizeW) || (size.height != sizeH)) { if ((size.width != sizeW) || (size.height != sizeH)) {
// component has been resized // component has been resized
offscreen = null;
if ((size.width > imageW) || (size.height > imageH)) {
// nix the image and recreate, it's too small
offscreen = null;
} else {
// who cares, just resize
sizeW = size.width;
sizeH = size.height;
}
} }
if (offscreen == null) { if (offscreen == null) {
@ -255,6 +246,8 @@ public class EditorHeader extends JComponent {
g.setColor(backgroundColor); g.setColor(backgroundColor);
g.fillRect(0, 0, imageW, imageH); g.fillRect(0, 0, imageW, imageH);
imageW = sizeW - 30 - menuButtons[0].getWidth(this);
List<EditorTab> tabs = editor.getTabs(); List<EditorTab> tabs = editor.getTabs();
int codeCount = tabs.size(); int codeCount = tabs.size();
@ -265,7 +258,8 @@ public class EditorHeader extends JComponent {
int x = scale(6); // offset from left edge of the component int x = scale(6); // offset from left edge of the component
int i = 0; int i = 0;
int x_selected = 0; int selected = 0;
int size_selected = 0;
// dry run, get the correct offset // dry run, get the correct offset
for (EditorTab tab : tabs) { for (EditorTab tab : tabs) {
@ -279,37 +273,33 @@ public class EditorHeader extends JComponent {
font.getStringBounds(text, g.getFontRenderContext()).getWidth(); font.getStringBounds(text, g.getFontRenderContext()).getWidth();
int pieceCount = 2 + (textWidth / PIECE_WIDTH); int pieceCount = 2 + (textWidth / PIECE_WIDTH);
int pieceWidth = pieceCount * PIECE_WIDTH;
int state = (i == editor.getCurrentTabIndex()) ? SELECTED : UNSELECTED; int state = (i == editor.getCurrentTabIndex()) ? SELECTED : UNSELECTED;
int x_initial = x;
x += PIECE_WIDTH; x += PIECE_WIDTH;
int contentLeft = x;
tabLeft[i] = x; tabLeft[i] = x;
for (int j = 0; j < pieceCount; j++) { x += PIECE_WIDTH * pieceCount;
x += PIECE_WIDTH;
}
tabRight[i] = x; tabRight[i] = x;
int textLeft = contentLeft + (pieceWidth - textWidth) / 2;
int baseline = (sizeH + fontAscent) / 2;
//g.drawString(sketch.code[i].name, textLeft, baseline);
x += PIECE_WIDTH - 1; // overlap by 1 pixel x += PIECE_WIDTH - 1; // overlap by 1 pixel
if (state == SELECTED) { if (state == SELECTED) {
x_selected = x; selected = i;
size_selected = x - x_initial;
} }
i++; i++;
} }
if (x_selected > imageW) { int non_selected_tab_size = 0;
x = -(x_selected - imageW);
} else { if (x > imageW) {
x = scale(6); // offset from left edge of the component // find scaling factor
non_selected_tab_size = (imageW - size_selected)/(codeCount -1);
} }
i = 0; i = 0;
x = scale(6); // offset from left edge of the component
for (EditorTab tab : tabs) { for (EditorTab tab : tabs) {
SketchFile file = tab.getSketchFile(); SketchFile file = tab.getSketchFile();
@ -319,7 +309,36 @@ public class EditorHeader extends JComponent {
String text = " " + filename + (file.isModified() ? " \u00A7" : " "); String text = " " + filename + (file.isModified() ? " \u00A7" : " ");
int textWidth = (int) int textWidth = (int)
font.getStringBounds(text, g.getFontRenderContext()).getWidth(); font.getStringBounds(text, g.getFontRenderContext()).getWidth();
if (non_selected_tab_size > 0) {
if (i != selected) {
// find a suitable title
while (textWidth + 3 * PIECE_WIDTH > non_selected_tab_size && filename.length() > 2) {
filename = filename.substring(0, filename.length()-1);
text = " " + filename + ".." + (file.isModified() ? " \u00A7" : " ");
textWidth = (int)font.getStringBounds(text, g.getFontRenderContext()).getWidth();
}
}
}
int current_tab_size = non_selected_tab_size;
if (i == selected) {
current_tab_size = size_selected;
}
int padding = x + current_tab_size;
if (padding > imageW) {
if (i <= selected) {
// create another surface to overlay g
g.setColor(backgroundColor);
g.fillRect(0, 0, sizeW, imageH);
x = scale(6);
} else {
break;
}
}
int pieceCount = 2 + (textWidth / PIECE_WIDTH); int pieceCount = 2 + (textWidth / PIECE_WIDTH);
int pieceWidth = pieceCount * PIECE_WIDTH; int pieceWidth = pieceCount * PIECE_WIDTH;