diff options
Diffstat (limited to 'src/Slit.cc')
-rw-r--r-- | src/Slit.cc | 50 |
1 files changed, 26 insertions, 24 deletions
diff --git a/src/Slit.cc b/src/Slit.cc index c33d2e0..08370f9 100644 --- a/src/Slit.cc +++ b/src/Slit.cc | |||
@@ -722,8 +722,8 @@ Slitmenu::Slitmenu(Slit *sl) : Basemenu(sl->screen) { | |||
722 | 722 | ||
723 | update(); | 723 | update(); |
724 | 724 | ||
725 | if (slit->isOnTop()) setItemSelected(2, True); | 725 | if (slit->isOnTop()) setItemSelected(2, true); |
726 | if (slit->doAutoHide()) setItemSelected(3, True); | 726 | if (slit->doAutoHide()) setItemSelected(3, true); |
727 | } | 727 | } |
728 | 728 | ||
729 | 729 | ||
@@ -738,30 +738,32 @@ Slitmenu::~Slitmenu(void) { | |||
738 | } | 738 | } |
739 | 739 | ||
740 | 740 | ||
741 | void Slitmenu::itemSelected(int button, int index) { | 741 | void Slitmenu::itemSelected(int button, unsigned int index) { |
742 | if (button == 1) { | 742 | if (button == 1) { |
743 | BasemenuItem *item = find(index); | 743 | BasemenuItem *item = find(index); |
744 | if (! item) return; | 744 | if (! item) return; |
745 | 745 | ||
746 | switch (item->function()) { | 746 | switch (item->function()) { |
747 | case 1: // always on top | 747 | case 1: // always on top |
748 | { | 748 | { |
749 | Bool change = ((slit->isOnTop()) ? False : True); | 749 | bool change = ((slit->isOnTop()) ? false : true); |
750 | slit->on_top = change; | 750 | slit->on_top = change; |
751 | setItemSelected(2, change); | 751 | setItemSelected(2, change); |
752 | 752 | ||
753 | if (slit->isOnTop()) slit->screen->raiseWindows((Window *) 0, 0); | 753 | if (slit->isOnTop()) |
754 | break; | 754 | slit->screen->raiseWindows((Window *) 0, 0); |
755 | } | 755 | |
756 | break; | ||
757 | } | ||
756 | 758 | ||
757 | case 2: // auto hide | 759 | case 2: // auto hide |
758 | { | 760 | { |
759 | Bool change = ((slit->doAutoHide()) ? False : True); | 761 | bool change = ((slit->doAutoHide()) ? false : true); |
760 | slit->do_auto_hide = change; | 762 | slit->do_auto_hide = change; |
761 | setItemSelected(3, change); | 763 | setItemSelected(3, change); |
762 | 764 | ||
763 | break; | 765 | break; |
764 | } | 766 | } |
765 | } | 767 | } |
766 | } | 768 | } |
767 | } | 769 | } |
@@ -820,13 +822,13 @@ Slitmenu::Directionmenu::Directionmenu(Slitmenu *sm) : Basemenu(sm->slit->screen | |||
820 | update(); | 822 | update(); |
821 | 823 | ||
822 | if (sm->slit->screen->getSlitDirection() == Slit::HORIZONTAL) | 824 | if (sm->slit->screen->getSlitDirection() == Slit::HORIZONTAL) |
823 | setItemSelected(0, True); | 825 | setItemSelected(0, true); |
824 | else | 826 | else |
825 | setItemSelected(1, True); | 827 | setItemSelected(1, true); |
826 | } | 828 | } |
827 | 829 | ||
828 | 830 | ||
829 | void Slitmenu::Directionmenu::itemSelected(int button, int index) { | 831 | void Slitmenu::Directionmenu::itemSelected(int button, unsigned int index) { |
830 | if (button == 1) { | 832 | if (button == 1) { |
831 | BasemenuItem *item = find(index); | 833 | BasemenuItem *item = find(index); |
832 | if (! item) return; | 834 | if (! item) return; |
@@ -834,11 +836,11 @@ void Slitmenu::Directionmenu::itemSelected(int button, int index) { | |||
834 | slitmenu->slit->screen->saveSlitDirection(item->function()); | 836 | slitmenu->slit->screen->saveSlitDirection(item->function()); |
835 | 837 | ||
836 | if (item->function() == Slit::HORIZONTAL) { | 838 | if (item->function() == Slit::HORIZONTAL) { |
837 | setItemSelected(0, True); | 839 | setItemSelected(0, true); |
838 | setItemSelected(1, False); | 840 | setItemSelected(1, false); |
839 | } else { | 841 | } else { |
840 | setItemSelected(0, False); | 842 | setItemSelected(0, false); |
841 | setItemSelected(1, True); | 843 | setItemSelected(1, true); |
842 | } | 844 | } |
843 | 845 | ||
844 | hide(); | 846 | hide(); |
@@ -931,7 +933,7 @@ Slitmenu::Placementmenu::Placementmenu(Slitmenu *sm) : Basemenu(sm->slit->screen | |||
931 | } | 933 | } |
932 | 934 | ||
933 | 935 | ||
934 | void Slitmenu::Placementmenu::itemSelected(int button, int index) { | 936 | void Slitmenu::Placementmenu::itemSelected(int button, unsigned int index) { |
935 | if (button == 1) { | 937 | if (button == 1) { |
936 | BasemenuItem *item = find(index); | 938 | BasemenuItem *item = find(index); |
937 | if (! item) return; | 939 | if (! item) return; |