Merge branch 'master' into jgrpp

# Conflicts:
#	src/widgets/dropdown.cpp
#	src/widgets/dropdown_type.h
This commit is contained in:
Jonathan G Rennison
2023-04-17 20:51:54 +01:00
19 changed files with 125 additions and 102 deletions

View File

@@ -140,6 +140,11 @@ public:
this->viewport->dest_scrollpos_y = this->viewport->scrollpos_y;
}
bool OnRightClick(Point pt, int widget) override
{
return widget == WID_EV_VIEWPORT;
}
void OnMouseWheel(int wheel) override
{
if (_ctrl_pressed) {