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>
113 lines
2.8 KiB
C++
113 lines
2.8 KiB
C++
#ifndef slic3r_GUI_DropDown_hpp_
|
|
#define slic3r_GUI_DropDown_hpp_
|
|
|
|
#include <wx/stattext.h>
|
|
#include "../wxExtensions.hpp"
|
|
#include "StateHandler.hpp"
|
|
#include "PopupWindow.hpp"
|
|
|
|
#define DD_NO_CHECK_ICON 0x0001
|
|
#define DD_NO_TEXT 0x0002
|
|
#define DD_STYLE_MASK 0x0003
|
|
|
|
wxDECLARE_EVENT(EVT_DISMISS, wxCommandEvent);
|
|
|
|
class DropDown : public PopupWindow
|
|
{
|
|
std::vector<wxString> & texts;
|
|
std::vector<wxBitmapBundle> & icons;
|
|
bool need_sync = false;
|
|
int selection = -1;
|
|
int hover_item = -1;
|
|
|
|
double radius = 0;
|
|
bool use_content_width = false;
|
|
bool limit_max_content_width = false;
|
|
bool align_icon = false;
|
|
bool text_off = false;
|
|
|
|
wxSize textSize;
|
|
wxSize iconSize;
|
|
wxSize rowSize;
|
|
|
|
StateHandler state_handler;
|
|
StateColor text_color;
|
|
StateColor border_color;
|
|
StateColor selector_border_color;
|
|
StateColor selector_background_color;
|
|
ScalableBitmap check_bitmap;
|
|
|
|
bool pressedDown = false;
|
|
boost::posix_time::ptime dismissTime;
|
|
wxPoint offset; // x not used
|
|
wxPoint dragStart;
|
|
|
|
public:
|
|
DropDown(std::vector<wxString> &texts,
|
|
std::vector<wxBitmapBundle> &icons);
|
|
|
|
DropDown(wxWindow * parent,
|
|
std::vector<wxString> &texts,
|
|
std::vector<wxBitmapBundle> &icons,
|
|
long style = 0);
|
|
|
|
void Create(wxWindow * parent,
|
|
long style = 0);
|
|
|
|
public:
|
|
void Invalidate(bool clear = false);
|
|
|
|
int GetSelection() const { return selection; }
|
|
|
|
void SetSelection(int n);
|
|
|
|
wxString GetValue() const;
|
|
void SetValue(const wxString &value);
|
|
|
|
public:
|
|
void SetCornerRadius(double radius);
|
|
|
|
void SetBorderColor(StateColor const & color);
|
|
|
|
void SetSelectorBorderColor(StateColor const & color);
|
|
|
|
void SetTextColor(StateColor const &color);
|
|
|
|
void SetSelectorBackgroundColor(StateColor const &color);
|
|
|
|
void SetUseContentWidth(bool use, bool limit_max_content_width = false);
|
|
|
|
void SetAlignIcon(bool align);
|
|
|
|
public:
|
|
void Rescale();
|
|
|
|
bool HasDismissLongTime();
|
|
|
|
protected:
|
|
void OnDismiss() override;
|
|
|
|
private:
|
|
void paintEvent(wxPaintEvent& evt);
|
|
void paintNow();
|
|
|
|
void render(wxDC& dc);
|
|
|
|
friend class ComboBox;
|
|
void messureSize();
|
|
void autoPosition();
|
|
|
|
// some useful events
|
|
void mouseDown(wxMouseEvent& event);
|
|
void mouseReleased(wxMouseEvent &event);
|
|
void mouseCaptureLost(wxMouseCaptureLostEvent &event);
|
|
void mouseMove(wxMouseEvent &event);
|
|
void mouseWheelMoved(wxMouseEvent &event);
|
|
|
|
void sendDropDownEvent();
|
|
|
|
|
|
DECLARE_EVENT_TABLE()
|
|
};
|
|
|
|
#endif // !slic3r_GUI_DropDown_hpp_
|