Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Two scrolllist update scraps find a home in this commit

Browse Source
This commit is contained in:
Lirusaito
2013-07-16 09:45:00 -04:00
parent 599704cf40
commit 824bec5d69
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
indra/llui/llscrolllistcolumn.cpp
View File

@@ -32,6 +32,7 @@
#include "llbutton.h" #include "llbutton.h"
#include "llkeyboard.h" // For gKeyboard #include "llkeyboard.h" // For gKeyboard
#include "llresizebar.h" #include "llresizebar.h"
#include "llscrolllistctrl.h"
#include "lluictrlfactory.h" #include "lluictrlfactory.h"
const S32 MIN_COLUMN_WIDTH = 20; const S32 MIN_COLUMN_WIDTH = 20;
@@ -136,6 +137,8 @@ LLView* LLScrollColumnHeader::findSnapEdge(S32& new_edge_val, const LLCoordGL& m
LLRect snap_rect = getSnapRect(); LLRect snap_rect = getSnapRect();
mColumn->mParentCtrl->calcMaxContentWidth();
S32 snap_delta = mColumn->mMaxContentWidth - snap_rect.getWidth(); S32 snap_delta = mColumn->mMaxContentWidth - snap_rect.getWidth();
// x coord growing means column growing, so same signs mean we're going in right direction // x coord growing means column growing, so same signs mean we're going in right direction

2
indra/llui/llscrolllistctrl.cpp
View File

@@ -1694,8 +1694,6 @@ BOOL LLScrollListCtrl::handleMouseDown(S32 x, S32 y, MASK mask)
mSelectionChanged = false; mSelectionChanged = false;
handleClick(x, y, mask); handleClick(x, y, mask);
setFocus(TRUE);
} }
return TRUE; return TRUE;