Skip to content

Commit 75caff9

Browse files
author
dashodanger
committed
Allow helplinks to work even if module is disabled
1 parent fbd1179 commit 75caff9

File tree

1 file changed

+65
-9
lines changed

1 file changed

+65
-9
lines changed

source/ui_module.cc

Lines changed: 65 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,11 @@ void UI_Module::AddOption(const std::string &opt, const std::string &label, cons
220220
if (collapse_disabled_modules)
221221
rch->hide();
222222
else
223-
rch->deactivate();
223+
{
224+
rch->mod_label->deactivate();
225+
rch->mod_menu->deactivate();
226+
rch->mod_reset->deactivate();
227+
}
224228
}
225229

226230
add(rch);
@@ -328,6 +332,8 @@ void UI_Module::AddSliderOption(const std::string &opt, std::string &label, cons
328332
}
329333
rsl->nan_options->callback(callback_NanOptions, NULL);
330334
}
335+
else
336+
rsl->nan_options = nullptr;
331337

332338
rsl->mod_entry = new UI_ManualEntry(rsl->x() + (rsl->w() * .85), rsl->y(), rsl->w() * .075, KromulentHeight(24));
333339
rsl->mod_entry->box(FL_NO_BOX);
@@ -412,7 +418,17 @@ void UI_Module::AddSliderOption(const std::string &opt, std::string &label, cons
412418
if (collapse_disabled_modules)
413419
rsl->hide();
414420
else
415-
rsl->deactivate();
421+
{
422+
rsl->prev_button->deactivate();
423+
rsl->next_button->deactivate();
424+
rsl->mod_label->deactivate();
425+
rsl->mod_reset->deactivate();
426+
rsl->mod_slider->deactivate();
427+
rsl->mod_entry->deactivate();
428+
rsl->unit_label->deactivate();
429+
if (rsl->nan_options)
430+
rsl->nan_options->deactivate();
431+
}
416432
}
417433

418434
add(rsl);
@@ -480,7 +496,11 @@ void UI_Module::AddButtonOption(const std::string &opt, const std::string &label
480496
if (collapse_disabled_modules)
481497
rbt->hide();
482498
else
483-
rbt->deactivate();
499+
{
500+
rbt->mod_label->deactivate();
501+
rbt->mod_check->deactivate();
502+
rbt->mod_reset->deactivate();
503+
}
484504
}
485505

486506
add(rbt);
@@ -527,14 +547,22 @@ void UI_Module::update_Enable()
527547
if (collapse_disabled_modules)
528548
M->show();
529549
else
530-
M->activate();
550+
{
551+
M->mod_label->activate();
552+
M->mod_menu->activate();
553+
M->mod_reset->activate();
554+
}
531555
}
532556
else
533557
{
534558
if (collapse_disabled_modules)
535559
M->hide();
536560
else
537-
M->deactivate();
561+
{
562+
M->mod_label->deactivate();
563+
M->mod_menu->deactivate();
564+
M->mod_reset->deactivate();
565+
}
538566
}
539567
}
540568

@@ -547,14 +575,34 @@ void UI_Module::update_Enable()
547575
if (collapse_disabled_modules)
548576
M->show();
549577
else
550-
M->activate();
578+
{
579+
M->unit_label->activate();
580+
M->prev_button->activate();
581+
M->next_button->activate();
582+
M->mod_label->activate();
583+
M->mod_reset->activate();
584+
M->mod_slider->activate();
585+
M->mod_entry->activate();
586+
if (M->nan_options)
587+
M->nan_options->activate();
588+
}
551589
}
552590
else
553591
{
554592
if (collapse_disabled_modules)
555593
M->hide();
556594
else
557-
M->deactivate();
595+
{
596+
M->unit_label->deactivate();
597+
M->prev_button->deactivate();
598+
M->next_button->deactivate();
599+
M->mod_label->deactivate();
600+
M->mod_reset->deactivate();
601+
M->mod_slider->deactivate();
602+
M->mod_entry->deactivate();
603+
if (M->nan_options)
604+
M->nan_options->deactivate();
605+
}
558606
}
559607
}
560608

@@ -567,14 +615,22 @@ void UI_Module::update_Enable()
567615
if (collapse_disabled_modules)
568616
M->show();
569617
else
570-
M->activate();
618+
{
619+
M->mod_label->activate();
620+
M->mod_check->activate();
621+
M->mod_reset->activate();
622+
}
571623
}
572624
else
573625
{
574626
if (collapse_disabled_modules)
575627
M->hide();
576628
else
577-
M->deactivate();
629+
{
630+
M->mod_label->deactivate();
631+
M->mod_check->deactivate();
632+
M->mod_reset->deactivate();
633+
}
578634
}
579635
}
580636

0 commit comments

Comments
 (0)