QIDITECH/QIDISlicer
1
0
Fork 0
mirror of https://github.com/QIDITECH/QIDISlicer.git synced 2026-02-03 01:18:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

Prusa 2.7.2

Browse Source
This commit is contained in:
sunsets
2024-03-27 14:38:03 +08:00
parent 63daf0c087
commit 2387bc9cdb
203 changed files with 6053 additions and 15634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/slic3r/GUI/Widgets/ComboBox.cpp
View File

@@ -291,7 +291,6 @@ void ComboBox::mouseDown(wxMouseEvent &event)
void ComboBox::mouseWheelMoved(wxMouseEvent &event)
{
event.Skip();
if (drop_down) return;
auto delta = ((event.GetWheelRotation() < 0) == event.IsWheelInverted()) ? -1 : 1;
unsigned int n = GetSelection() + delta;
@@ -305,15 +304,12 @@ void ComboBox::keyDown(wxKeyEvent& event)
{
int key_code = event.GetKeyCode();
switch (key_code) {
case WXK_RETURN:
case WXK_RETURN: {
if (drop_down) {
drop.DismissAndNotify();
wxCommandEvent e(wxEVT_COMBOBOX);
e.SetEventObject(this);
e.SetId(GetId());
e.SetInt(GetSelection());
GetEventHandler()->ProcessEvent(e);
} else if (drop.HasDismissLongTime()) {
sendComboBoxEvent();
}
else if (drop.HasDismissLongTime()) {
drop.autoPosition();
drop_down = true;
drop.Popup();
@@ -321,14 +317,19 @@ void ComboBox::keyDown(wxKeyEvent& event)
GetEventHandler()->ProcessEvent(e);
}
break;
}
case WXK_UP: {
if (GetSelection() > 0)
SetSelection(GetSelection() - 1);
if (!drop.IsShown())
sendComboBoxEvent();
break;
}
case WXK_DOWN: {
if (GetSelection() + 1 < int(texts.size()))
SetSelection(GetSelection() + 1);
if (!drop.IsShown())
sendComboBoxEvent();
break;
}
case WXK_LEFT: {

1
src/slic3r/GUI/Widgets/DropDown.hpp
View File

@@ -85,6 +85,7 @@ public:
bool HasDismissLongTime();
static void SetTransparentBG(wxDC& dc, wxWindow* win);
void CallDismissAndNotify() { DismissAndNotify(); }
protected:
void OnDismiss() override;