"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/IconList.cpp" between
xfe-1.42.tar.gz and xfe-1.43.tar.gz

About: Xfe (X File Explorer) is a file manager and browser (using the FOX toolkit).

IconList.cpp  (xfe-1.42):IconList.cpp  (xfe-1.43)
skipping to change at line 32 skipping to change at line 32
// Number of columns in detailed view, in the general case // Number of columns in detailed view, in the general case
// NB : when the deletion date and original path are displayed, two more columns are added // NB : when the deletion date and original path are displayed, two more columns are added
#define NUM_HEADERS 8 #define NUM_HEADERS 8
#define SIDE_SPACING 4 // Left or right spacing between items #define SIDE_SPACING 4 // Left or right spacing between items
#define DETAIL_TEXT_SPACING 2 // Spacing between text and icon in detail icon mode #define DETAIL_TEXT_SPACING 2 // Spacing between text and icon in detail icon mode
#define MINI_TEXT_SPACING 2 // Spacing between text and icon in mini i con mode #define MINI_TEXT_SPACING 2 // Spacing between text and icon in mini i con mode
#define BIG_LINE_SPACING 6 // Line spacing in big icon mode #define BIG_LINE_SPACING 6 // Line spacing in big icon mode
#define BIG_TEXT_SPACING 2 // Spacing between text and icon in big ic on mode #define BIG_TEXT_SPACING 2 // Spacing between text and icon in big ic on mode
#define ITEM_SPACE 192 // Default space for item name #define ITEM_SPACE 192 // Default space for item name
#define ITEM_HEIGHT 1 // Initial item height
#define ITEM_WIDTH 1 // Initial item width
#define SELECT_MASK (_ICONLIST_EXTENDEDSELECT|_ICONLIST_SINGLESELECT| _ICONLIST_BROWSESELECT|_ICONLIST_MULTIPLESELECT) #define SELECT_MASK (_ICONLIST_EXTENDEDSELECT|_ICONLIST_SINGLESELECT| _ICONLIST_BROWSESELECT|_ICONLIST_MULTIPLESELECT)
#define ICONLIST_MASK (SELECT_MASK|_ICONLIST_MINI_ICONS|_ICONLIST_BIG_I CONS|_ICONLIST_COLUMNS|_ICONLIST_AUTOSIZE) #define ICONLIST_MASK (SELECT_MASK|_ICONLIST_MINI_ICONS|_ICONLIST_BIG_I CONS|_ICONLIST_COLUMNS|_ICONLIST_AUTOSIZE)
extern FXuint single_click; extern FXuint single_click;
extern FXbool file_tooltips; extern FXbool file_tooltips;
extern FXbool relative_resize; extern FXbool relative_resize;
// Object implementation // Object implementation
FXIMPLEMENT(IconItem, FXObject, NULL, 0) FXIMPLEMENT(IconItem, FXObject, NULL, 0)
skipping to change at line 819 skipping to change at line 821
R = (FXuint)(DARKEN_SORT*FXREDVAL(listbackColor)); R = (FXuint)(DARKEN_SORT*FXREDVAL(listbackColor));
G = (FXuint)(DARKEN_SORT*FXGREENVAL(listbackColor)); G = (FXuint)(DARKEN_SORT*FXGREENVAL(listbackColor));
B = (FXuint)(DARKEN_SORT*FXBLUEVAL(listbackColor)); B = (FXuint)(DARKEN_SORT*FXBLUEVAL(listbackColor));
sortColor = FXRGB(R, G, B); sortColor = FXRGB(R, G, B);
R = (FXuint)(DARKEN_SORT*FXREDVAL(highlightColor)); R = (FXuint)(DARKEN_SORT*FXREDVAL(highlightColor));
G = (FXuint)(DARKEN_SORT*FXGREENVAL(highlightColor)); G = (FXuint)(DARKEN_SORT*FXGREENVAL(highlightColor));
B = (FXuint)(DARKEN_SORT*FXBLUEVAL(highlightColor)); B = (FXuint)(DARKEN_SORT*FXBLUEVAL(highlightColor));
highlightSortColor = FXRGB(R, G, B); highlightSortColor = FXRGB(R, G, B);
itemSpace = ITEM_SPACE; itemSpace = ITEM_SPACE;
itemWidth = 1; itemWidth = ITEM_WIDTH;
itemHeight = 1; itemHeight = ITEM_HEIGHT;
anchorx = 0; anchorx = 0;
anchory = 0; anchory = 0;
currentx = 0; currentx = 0;
currenty = 0; currenty = 0;
grabx = 0; grabx = 0;
graby = 0; graby = 0;
state = false; state = false;
numsortheader = 0; numsortheader = 0;
count = 0; count = 0;
ignorecase = true; ignorecase = true;
skipping to change at line 959 skipping to change at line 961
FXScrollArea::recalc(); FXScrollArea::recalc();
flags |= FLAG_RECALC; flags |= FLAG_RECALC;
cursor = -1; cursor = -1;
} }
// Recompute interior // Recompute interior
void IconList::recompute() void IconList::recompute()
{ {
register int w, h, i; register int w, h, i;
itemWidth = 1; itemWidth = ITEM_WIDTH;
itemHeight = 1; itemHeight = ITEM_HEIGHT;
// Measure the items // Measure the items
for (i = 0; i < items.no(); i++) for (i = 0; i < items.no(); i++)
{ {
w = items[i]->getWidth(this); w = items[i]->getWidth(this);
h = items[i]->getHeight(this); h = items[i]->getHeight(this);
if (w > itemWidth) if (w > itemWidth)
{ {
itemWidth = w; itemWidth = w;
} }
skipping to change at line 2479 skipping to change at line 2481
FXASSERT(current < items.no()); FXASSERT(current < items.no());
items[current]->setFocus(false); items[current]->setFocus(false);
updateItem(current); updateItem(current);
} }
return(1); return(1);
} }
// Draw item list // Draw item list
long IconList::onPaint(FXObject*, FXSelector, void* ptr) long IconList::onPaint(FXObject*, FXSelector, void* ptr)
{ {
// Don't draw if item height hasn't been computed
if (itemHeight == ITEM_HEIGHT)
{
return (0);
}
register int rlo, rhi, clo, chi, yy, xx; register int rlo, rhi, clo, chi, yy, xx;
register int x, y, r, c, index; register int x, y, r, c, index;
FXEvent* event = (FXEvent*)ptr; FXEvent* event = (FXEvent*)ptr;
FXDCWindow dc(this, event); FXDCWindow dc(this, event);
// Set font // Set font
dc.setFont(font); dc.setFont(font);
// Icon mode // Icon mode
if (options&(_ICONLIST_BIG_ICONS|_ICONLIST_MINI_ICONS)) if (options&(_ICONLIST_BIG_ICONS|_ICONLIST_MINI_ICONS))
 End of changes. 4 change blocks. 
4 lines changed or deleted 12 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)