mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-10-19 23:01:22 -06:00
25a055491e
* Upgrade wxWidgets to 3.2.1
Based on prusa3d/PrusaSlicer@9a7e024
Co-authored-by: tamasmeszaros <meszaros.q@gmail.com>
* Implement BitmapCache
* update wxExtensions while keeping legacy items
* update dc.DrawBitmap calls to use get_bitmap
* Fix GetSize/Width/Height calls
* update BitmapComboBox
* fix ifndef in wxExtensions.hpp
* update my todos to OcraftyoneTODO
* Get to a compilable state
Everything seems to be working (including the plater). I am not seeing any graphical issues
* fix extruder color icons
* fix crash on opening support tab
* remove GetBmpSize method from DropDown.cpp
* Update TextInput to use bitmap bundles
* update a TODO after testing
* fix the rendering of the icons on combobox
* fix a few todos
* fix WipeTowerDialog.cpp
* Overhaul WipeTowerDialog
Removed simple version of the dialog since BBS removed the functionality but left the code.
Center the table (only seen when the table is smaller than the minimum size of the dialog)
Fix issue where editing a value causes the m_min_flush_label to change colors slightly
Fix an issue where changing a value or running an auto calc changes the disabled value from "-" to "0"
* update a few todos
* Update some todos
* Show dropdown when editing is started
* Update NanoSVG.cmake
Update NanoSVG to work with PR #2780
* Dim the icon on ComboBox when disabled
* solve ObjectDataViewModel todos
leaving colPrint and colEditing cases alone as it does not seem to impact anything
* Update names in wxExtensions
-Rename msw_rescale to sys_color_changed
-Replace GetBmpSize, GetBmpWidth, GetBmpHeight with renamed version (same name without "Bmp")
Both of these changes were also made by PrusaSlicer.
Original Commit: Prusa3D/PrusaSlicer@066b567
Co-authored-by: YuSanka <yusanka@gmail.com>
* update BitmapCache::from_svg
disable finding bundle in the cache to match load_svg
update to match values used in load_svg
* Update ScalableButton
change the signature and remove functions/vars pertaining to a default bmp
fix TODOs in ScalableButton
Original Commit: Prusa3D/PrusaSlicer@066b567
Co-authored-by: YuSanka <yusanka@gmail.com>
* fix up some more todos in wxExtensions
* update ScalableBitmap to use bmp bundles
use wxBitmapBundle by default
add flag to use old scaled bitmap function (specifically to solve issue with advanced toggle)
* attempt to fix macos deps build
* fix ubuntu build
* Revert "attempt to fix macos deps build"
Mistakenly made change to wrong file
This reverts commit d9c20b5121.
* update wxWidgets patch
an attempt to fix macOS build
* Remove duplicate variable from OrcaSlicer.cpp
* Fix macOS build issue
* Fix blank DataViewItem being added to objects list
* Filament ComboBox editor updates
-Add show drop down feature to ObjectTable
-Call finish editing when ComboBox is closed in ObjectList
* remove Apple specific declarations missed during refactor
* delete old wxWidgets patch
* fix ubuntu seg fault
* include patch from #2926
* update patch to include wxWidgets/wxWidgets@991a74c
* fix deps not compiling on Windows
* update WipeTowerDialog
relocates the recalculate button back to its previous position
changes the wording of the tip message label
add spacing below the matrix
* finish patching wxWidgets
from prusa3d/PrusaSlicer@f8477d1 and prusa3d/PrusaSlicer@066b567
Co-authored-by: YuSanka <yusanka@gmail.com>
* fix combobox crash
* revert outside plate changes
---------
Co-authored-by: tamasmeszaros <meszaros.q@gmail.com>
Co-authored-by: YuSanka <yusanka@gmail.com>
99 lines
2.9 KiB
C++
99 lines
2.9 KiB
C++
#ifndef slic3r_GUI_ComboBox_hpp_
|
|
#define slic3r_GUI_ComboBox_hpp_
|
|
|
|
#include "TextInput.hpp"
|
|
#include "DropDown.hpp"
|
|
|
|
#define CB_NO_DROP_ICON DD_NO_CHECK_ICON
|
|
#define CB_NO_TEXT DD_NO_TEXT
|
|
|
|
class ComboBox : public wxWindowWithItems<TextInput, wxItemContainer>
|
|
{
|
|
std::vector<wxString> texts;
|
|
std::vector<wxBitmapBundle> icons;
|
|
std::vector<void *> datas;
|
|
std::vector<wxClientDataType> types;
|
|
|
|
DropDown drop;
|
|
bool drop_down = false;
|
|
bool text_off = false;
|
|
|
|
public:
|
|
ComboBox(wxWindow * parent,
|
|
wxWindowID id,
|
|
const wxString &value = wxEmptyString,
|
|
const wxPoint & pos = wxDefaultPosition,
|
|
const wxSize & size = wxDefaultSize,
|
|
int n = 0,
|
|
const wxString choices[] = NULL,
|
|
long style = 0);
|
|
|
|
DropDown & GetDropDown() { return drop; }
|
|
|
|
virtual bool SetFont(wxFont const & font) override;
|
|
|
|
int Append(const wxString &item, const wxBitmapBundle &bitmap = wxNullBitmap);
|
|
|
|
int Append(const wxString &item, const wxBitmapBundle &bitmap, void *clientData);
|
|
|
|
unsigned int GetCount() const override;
|
|
|
|
int GetSelection() const override;
|
|
|
|
void SetSelection(int n) override;
|
|
|
|
void SelectAndNotify(int n);
|
|
|
|
virtual void Rescale() override;
|
|
|
|
wxString GetValue() const;
|
|
void SetValue(const wxString &value);
|
|
|
|
void SetLabel(const wxString &label) override;
|
|
wxString GetLabel() const override;
|
|
|
|
void SetTextLabel(const wxString &label);
|
|
wxString GetTextLabel() const;
|
|
|
|
wxString GetString(unsigned int n) const override;
|
|
void SetString(unsigned int n, wxString const &value) override;
|
|
|
|
wxBitmap GetItemBitmap(unsigned int n);
|
|
void SetItemBitmap(unsigned int n, wxBitmapBundle const &bitmap);
|
|
|
|
void ToggleDropDown();
|
|
bool Enable(bool enable = true) override;
|
|
void SetIcon(const wxBitmapBundle &icon) override;
|
|
|
|
protected:
|
|
virtual int DoInsertItems(const wxArrayStringsAdapter &items,
|
|
unsigned int pos,
|
|
void ** clientData,
|
|
wxClientDataType type) override;
|
|
virtual void DoClear() override;
|
|
|
|
void DoDeleteOneItem(unsigned int pos) override;
|
|
|
|
void *DoGetItemClientData(unsigned int n) const override;
|
|
void DoSetItemClientData(unsigned int n, void *data) override;
|
|
|
|
void OnEdit() override;
|
|
|
|
void sendComboBoxEvent();
|
|
|
|
#ifdef __WIN32__
|
|
WXLRESULT MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam) override;
|
|
#endif
|
|
|
|
private:
|
|
|
|
// some useful events
|
|
void mouseDown(wxMouseEvent &event);
|
|
void mouseWheelMoved(wxMouseEvent &event);
|
|
void keyDown(wxKeyEvent &event);
|
|
void onMove(wxMoveEvent &event);
|
|
|
|
DECLARE_EVENT_TABLE()
|
|
};
|
|
|
|
#endif // !slic3r_GUI_ComboBox_hpp_
|