mirror of
https://github.com/gryf/wmaker.git
synced 2025-12-19 04:20:27 +01:00
changed stuff in WMSetBoxExpandsToParent
This commit is contained in:
@@ -649,7 +649,7 @@ static void drawRow(WMTableView *table, int row, WMRect clipRect)
|
||||
int i;
|
||||
WMRange cols = columnsInRect(table, clipRect);
|
||||
WMTableColumn *column;
|
||||
|
||||
|
||||
for (i = cols.position; i < cols.position+cols.count; i++) {
|
||||
column = WMGetFromArray(table->columns, i);
|
||||
|
||||
@@ -718,10 +718,13 @@ static void repaintTable(WMTableView *table, int x, int y,
|
||||
table->rows * table->rowHeight + 1);
|
||||
}
|
||||
|
||||
|
||||
if (x >= table->tableWidth-1)
|
||||
return;
|
||||
|
||||
rect.pos = wmkpoint(x,y);
|
||||
rect.size = wmksize(width, height);
|
||||
|
||||
|
||||
if (table->drawsGrid) {
|
||||
drawGrid(table, rect);
|
||||
}
|
||||
@@ -793,6 +796,9 @@ void WMReloadTableView(WMTableView *table)
|
||||
{
|
||||
WMRect rect = WMGetScrollViewVisibleRect(table->scrollView);
|
||||
|
||||
if (table->editingRow >= 0)
|
||||
stopRowEdit(table, table->editingRow);
|
||||
|
||||
/* when this is called, nothing in the table can be assumed to be
|
||||
* like the last time we accessed it (ie, rows might have disappeared) */
|
||||
|
||||
|
||||
1761
WINGs/WINGs.h
Normal file
1761
WINGs/WINGs.h
Normal file
File diff suppressed because it is too large
Load Diff
22
WINGs/wbox.c
22
WINGs/wbox.c
@@ -23,6 +23,11 @@ typedef struct W_Box {
|
||||
|
||||
short borderWidth;
|
||||
|
||||
int topOffs;
|
||||
int bottomOffs;
|
||||
int leftOffs;
|
||||
int rightOffs;
|
||||
|
||||
unsigned horizontal:1;
|
||||
} Box;
|
||||
|
||||
@@ -53,8 +58,11 @@ static void resizedParent(void *self, WMNotification *notif)
|
||||
{
|
||||
WMView *view = (WMView*)WMGetNotificationObject(notif);
|
||||
WMSize size = WMGetViewSize(view);
|
||||
WMBox *box = (WMBox*)self;
|
||||
|
||||
WMResizeWidget((WMWidget*)self, size.width, size.height);
|
||||
WMMoveWidget(box, box->leftOffs, box->topOffs);
|
||||
WMResizeWidget(box, size.width - (box->leftOffs + box->rightOffs),
|
||||
size.height - (box->topOffs + box->bottomOffs));
|
||||
}
|
||||
|
||||
|
||||
@@ -242,16 +250,24 @@ WMSetBoxHorizontal(WMBox *box, Bool flag)
|
||||
|
||||
|
||||
void
|
||||
WMSetBoxExpandsToParent(WMBox *box)
|
||||
WMSetBoxExpandsToParent(WMBox *box, int topOffs, int bottomOffs,
|
||||
int leftOffs, int rightOffs)
|
||||
{
|
||||
WMSize size = W_VIEW(box)->parent->size;
|
||||
|
||||
box->topOffs = topOffs;
|
||||
box->bottomOffs = bottomOffs;
|
||||
box->leftOffs = leftOffs;
|
||||
box->rightOffs = rightOffs;
|
||||
|
||||
WMAddNotificationObserver(resizedParent, box,
|
||||
WMViewSizeDidChangeNotification,
|
||||
W_VIEW(box)->parent);
|
||||
WMSetViewNotifySizeChanges(W_VIEW(box)->parent, True);
|
||||
|
||||
WMResizeWidget(box, size.width, size.height);
|
||||
WMMoveWidget(box, leftOffs, topOffs);
|
||||
WMResizeWidget(box, size.width - (leftOffs + rightOffs),
|
||||
size.height - (topOffs + bottomOffs));
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -125,7 +125,7 @@ WMCreateAlertPanel(WMScreen *scrPtr, WMWindow *owner,
|
||||
WMSetWindowTitle(panel->win, "");
|
||||
|
||||
panel->vbox = WMCreateBox(panel->win);
|
||||
WMSetBoxExpandsToParent(panel->vbox);
|
||||
WMSetBoxExpandsToParent(panel->vbox, 0, 0, 0, 0);
|
||||
WMSetBoxHorizontal(panel->vbox, False);
|
||||
WMMapWidget(panel->vbox);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user