github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-07-11 22:03:01 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

CtrlLib, CtrlCore: Now reading and using SPI_GETWHEELSCROLLLINES

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@7990 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2014-12-22 16:48:10 +00:00
parent 27f5c66fc2
commit 948e1554f7
5 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
uppsrc/CtrlCore/Ctrl.cpp
View file

@ -964,6 +964,7 @@ CH_INT(GUI_AltAccessKeys, 1);
CH_INT(GUI_AKD_Conservative, 0);
CH_INT(GUI_DragDistance, 4);
CH_INT(GUI_DblClickTime, 500);
CH_INT(GUI_WheelScrollLines, 3);
String Ctrl::Name0() const {
GuiLock __;

2
uppsrc/CtrlCore/CtrlCore.h
View file

@ -1301,6 +1301,7 @@ int GUI_AltAccessKeys();
int GUI_AKD_Conservative();
int GUI_DragDistance();
int GUI_DblClickTime();
int GUI_WheelScrollLines();
void GUI_GlobalStyle_Write(int);
void GUI_DragFullWindow_Write(int);
@ -1311,6 +1312,7 @@ void GUI_AltAccessKeys_Write(int);
void GUI_AKD_Conservative_Write(int);
void GUI_DragDistance_Write(int);
void GUI_DblClickTime_Write(int);
void GUI_WheelScrollLines_Write(int);
void EditFieldIsThin_Write(int);
void TopSeparator1_Write(Value);

4
uppsrc/CtrlLib/ChWin32.cpp
View file

@ -607,6 +607,10 @@ void ChSysInit()
GUI_DragDistance_Write(GetSystemMetrics(SM_CXDRAG));
GUI_DblClickTime_Write(GetDoubleClickTime());
int slines;
SystemParametersInfo(SPI_GETWHEELSCROLLLINES, 0, &slines, 0);
GUI_WheelScrollLines_Write(slines);
CtrlImg::Set(CtrlImg::I_information, Win32Icon(IDI_INFORMATION));
CtrlImg::Set(CtrlImg::I_question, Win32Icon(IDI_QUESTION));
CtrlImg::Set(CtrlImg::I_exclamation, Win32Icon(IDI_EXCLAMATION));

4
uppsrc/CtrlLib/ScrollBar.cpp
View file

@ -394,8 +394,8 @@ void ScrollBar::NextPage() {
Uset(pagepos + max(pagesize - linesize, 1));
}
void ScrollBar::Wheel(int zdelta, int lines) {
Uset(pagepos - lines * linesize * zdelta / 120);
void ScrollBar::Wheel(int zdelta) {
Uset(pagepos - GUI_WheelScrollLines() * linesize * zdelta / 120);
}
bool ScrollBar::VertKey(dword key, bool homeend) {

6
uppsrc/CtrlLib/ScrollBar.h
View file

@ -93,7 +93,7 @@ public:
void Begin();
void End();
void Wheel(int zdelta, int lines = 3);
void Wheel(int zdelta);
Size GetViewSize() const;
Size GetReducedViewSize() const;
@ -221,8 +221,8 @@ public:
void HorzBegin() { x.Begin(); }
void HorzEnd() { x.End(); }
void WheelX(int zdelta, int lines = 3) { x.Wheel(zdelta, lines); }
void WheelY(int zdelta, int lines = 3) { y.Wheel(zdelta, lines); }
void WheelX(int zdelta) { x.Wheel(zdelta); }
void WheelY(int zdelta) { y.Wheel(zdelta); }
Size GetViewSize() const;
Size GetReducedViewSize() const;