amy/MagicSetEditor2
1
0
Fork 0
mirror of https://github.com/amyinspace/MagicSetEditor2.git synced 2026-06-13 05:57:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Allow "Default" in slider fields

Browse Source
This commit is contained in:
GenevensiS
2025-05-22 22:15:35 +02:00
committed by GitHub
parent 616ea3f725
commit 2e48c5e868
2 changed files with 68 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gui/drop_down_list.cpp
+23 -17
View File
@@ -322,24 +322,27 @@ void DropDownList::draw(DC& dc) {
cs = GetClientSize(); cs = GetClientSize();
dc.SetPen(*wxBLACK_PEN); dc.SetPen(*wxBLACK_PEN);
dc.SetFont(wxFont(12, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, _("Arial"))); dc.SetFont(wxFont(12, wxFONTFAMILY_SWISS, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD, false, _("Arial")));
int first_text_width;
dc.GetTextExtent(capitalize(itemText(0)), &first_text_width, nullptr);
int last_text_width;
dc.GetTextExtent(capitalize(itemText(count-1)), &last_text_width, nullptr);
dc.DrawText(capitalize(itemText(0)), marginW + 4, 14);
dc.DrawText(capitalize(itemText(count-1)), cs.x - marginW - 4 - last_text_width, 14);
int slider_start = first_text_width + marginW + 16; String first_item = capitalize(itemText(0));
int slider_end = cs.x - (last_text_width + marginW + 16); if (first_item == _("Default")) first_item = capitalize(itemText(1));
String last_item = capitalize(itemText(count-1));
int first_text_width;
int last_text_width;
dc.GetTextExtent(first_item, &first_text_width, nullptr);
dc.GetTextExtent(last_item, &last_text_width, nullptr);
dc.DrawText(first_item, marginW + 8, 14);
dc.DrawText(last_item, cs.x - last_text_width - marginW - 8, 14);
int slider_start = first_text_width + marginW + 20;
int slider_end = cs.x - last_text_width - marginW - 20;
dc.DrawBitmap(slider_left, slider_start, 14); dc.DrawBitmap(slider_left, slider_start, 14);
for (size_t i = slider_start + 19; i < slider_end - 19; i+=19) { for (size_t i = slider_start + 19; i < slider_end - 19; i+=19) {
dc.DrawBitmap(slider_center, i, 14); dc.DrawBitmap(slider_center, i, 14);
} }
dc.DrawBitmap(slider_right, slider_end - 19, 14); dc.DrawBitmap(slider_right, slider_end - 19, 14);
int selected_index = selected_item < 0 ? 0 : selected_item; int selected_index = selected_item < 0 ? 0 : selected_item;
int slider_pos = round((double)selected_index/(count - 1) * (slider_end - slider_start)) + slider_start; int slider_pos = round((double)selected_index/(count-1) * (slider_end - slider_start)) + slider_start;
dc.DrawBitmap(slider_tick, slider_pos - 7, 9); // -7 cause the bitmap is 15 pixels wide dc.DrawBitmap(slider_tick, slider_pos - 7, 9); // -7 cause the slider_tick bitmap is 15 pixels wide
int selected_text_width; int selected_text_width;
dc.GetTextExtent(capitalize(itemText(selected_index)), &selected_text_width, nullptr); dc.GetTextExtent(capitalize(itemText(selected_index)), &selected_text_width, nullptr);
@@ -427,16 +430,19 @@ void DropDownList::onMotion(wxMouseEvent& ev) {
// find selected item // find selected item
size_t count = itemCount(); size_t count = itemCount();
if (is_slider) { if (is_slider) {
String first_item = capitalize(itemText(0));
if (first_item == _("Default")) first_item = capitalize(itemText(1));
String last_item = capitalize(itemText(count-1));
int first_text_width; int first_text_width;
GetTextExtent(capitalize(itemText(0)), &first_text_width, nullptr);
int last_text_width; int last_text_width;
GetTextExtent(capitalize(itemText(count - 1)), &last_text_width, nullptr); GetTextExtent(first_item, &first_text_width, nullptr);
int slider_start = first_text_width + marginW + 16; GetTextExtent(last_item, &last_text_width, nullptr);
int slider_end = cs.x - (last_text_width + marginW + 16); int slider_start = first_text_width + marginW + 20;
int slider_end = cs.x - last_text_width - marginW - 20;
int slider_pos = ev.GetX(); int slider_pos = ev.GetX();
if (slider_pos < slider_start) slider_pos = slider_start; if (slider_pos < slider_start) slider_pos = slider_start;
if (slider_pos > slider_end) slider_pos = slider_end; if (slider_pos > slider_end) slider_pos = slider_end;
int selected_item = round(((double)(slider_pos - slider_start)) / (slider_end - slider_start) * (count - 1)); int selected_item = round(((double)(slider_pos - slider_start)) / (slider_end - slider_start) * (count-1));
selectItem(selected_item); selectItem(selected_item);
} else { } else {
int startY = marginH - visible_start; int startY = marginH - visible_start;
src/gui/value/choice.cpp
+4 -2
View File
@@ -203,11 +203,13 @@ DropDownChoiceList::DropDownChoiceList(Window* parent, bool is_submenu, ValueVie
{ {
// determine if slider // determine if slider
size_t count = itemCount(); size_t count = itemCount();
if (count > 2) { if (count > 3) {
int value; int value;
try { try {
value = std::stoi(itemText(0).ToStdString()); String first_item = capitalize(itemText(0));
if (first_item != _("Default")) value = std::stoi(first_item.ToStdString());
value = std::stoi(itemText(1).ToStdString()); value = std::stoi(itemText(1).ToStdString());
value = std::stoi(itemText(count - 2).ToStdString());
value = std::stoi(itemText(count - 1).ToStdString()); value = std::stoi(itemText(count - 1).ToStdString());
// the choices are numbers, use a slider // the choices are numbers, use a slider
is_slider = true; is_slider = true;