summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--src/Toolbar.cc16
2 files changed, 11 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index cc266a6..6367429 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
1 (Format: Year/Month/Day) 1 (Format: Year/Month/Day)
2Changes for 1.0rc3: 2Changes for 1.0rc3:
3*06/12/18:
4 * Rotate items in toolbar the same way as tabs (Mark)
5 Toolbar.cc
3*06/12/17: 6*06/12/17:
4 * Stop cycling focus when any other command is run, e.g. bug #1595336 (Mark) 7 * Stop cycling focus when any other command is run, e.g. bug #1595336 (Mark)
5 fluxbox.cc WorkspaceCmd.cc 8 fluxbox.cc WorkspaceCmd.cc
diff --git a/src/Toolbar.cc b/src/Toolbar.cc
index f012570..6c4837a 100644
--- a/src/Toolbar.cc
+++ b/src/Toolbar.cc
@@ -721,7 +721,7 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
721 m_shape->setPlaces(Shape::TOPRIGHT | Shape::TOPLEFT); 721 m_shape->setPlaces(Shape::TOPRIGHT | Shape::TOPLEFT);
722 break; 722 break;
723 case LEFTCENTER: 723 case LEFTCENTER:
724 orient = FbTk::ROT90; 724 orient = FbTk::ROT270;
725 frame.x = head_x; 725 frame.x = head_x;
726 frame.y = head_y + (head_h - frame.height)/2 - border_width; 726 frame.y = head_y + (head_h - frame.height)/2 - border_width;
727 frame.x_hidden = frame.x - frame.width + bevel_width + border_width; 727 frame.x_hidden = frame.x - frame.width + bevel_width + border_width;
@@ -730,7 +730,7 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
730 m_shape->setPlaces(Shape::TOPRIGHT | Shape::BOTTOMRIGHT); 730 m_shape->setPlaces(Shape::TOPRIGHT | Shape::BOTTOMRIGHT);
731 break; 731 break;
732 case LEFTTOP: 732 case LEFTTOP:
733 orient = FbTk::ROT90; 733 orient = FbTk::ROT270;
734 frame.x = head_x; 734 frame.x = head_x;
735 frame.y = head_y; 735 frame.y = head_y;
736 frame.x_hidden = frame.x - frame.width + bevel_width + border_width; 736 frame.x_hidden = frame.x - frame.width + bevel_width + border_width;
@@ -739,7 +739,7 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
739 m_shape->setPlaces(Shape::TOPRIGHT | Shape::BOTTOMRIGHT); 739 m_shape->setPlaces(Shape::TOPRIGHT | Shape::BOTTOMRIGHT);
740 break; 740 break;
741 case LEFTBOTTOM: 741 case LEFTBOTTOM:
742 orient = FbTk::ROT90; 742 orient = FbTk::ROT270;
743 frame.x = head_x; 743 frame.x = head_x;
744 frame.y = head_y + head_h - frame.height - border_width*2; 744 frame.y = head_y + head_h - frame.height - border_width*2;
745 frame.x_hidden = frame.x - frame.width + bevel_width + border_width; 745 frame.x_hidden = frame.x - frame.width + bevel_width + border_width;
@@ -748,7 +748,7 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
748 m_shape->setPlaces(Shape::TOPRIGHT | Shape::BOTTOMRIGHT); 748 m_shape->setPlaces(Shape::TOPRIGHT | Shape::BOTTOMRIGHT);
749 break; 749 break;
750 case RIGHTCENTER: 750 case RIGHTCENTER:
751 orient = FbTk::ROT270; 751 orient = FbTk::ROT90;
752 frame.x = head_x + head_w - frame.width - border_width*2; 752 frame.x = head_x + head_w - frame.width - border_width*2;
753 frame.y = head_y + (head_h - frame.height)/2 - border_width; 753 frame.y = head_y + (head_h - frame.height)/2 - border_width;
754 frame.x_hidden = frame.x + frame.width - bevel_width - border_width; 754 frame.x_hidden = frame.x + frame.width - bevel_width - border_width;
@@ -757,7 +757,7 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
757 m_shape->setPlaces(Shape::TOPLEFT | Shape::BOTTOMLEFT); 757 m_shape->setPlaces(Shape::TOPLEFT | Shape::BOTTOMLEFT);
758 break; 758 break;
759 case RIGHTTOP: 759 case RIGHTTOP:
760 orient = FbTk::ROT270; 760 orient = FbTk::ROT90;
761 frame.x = head_x + head_w - frame.width - border_width*2; 761 frame.x = head_x + head_w - frame.width - border_width*2;
762 frame.y = head_y; 762 frame.y = head_y;
763 frame.x_hidden = frame.x + frame.width - bevel_width - border_width; 763 frame.x_hidden = frame.x + frame.width - bevel_width - border_width;
@@ -766,7 +766,7 @@ void Toolbar::setPlacement(Toolbar::Placement where) {
766 m_shape->setPlaces(Shape::TOPLEFT | Shape::BOTTOMLEFT); 766 m_shape->setPlaces(Shape::TOPLEFT | Shape::BOTTOMLEFT);
767 break; 767 break;
768 case RIGHTBOTTOM: 768 case RIGHTBOTTOM:
769 orient = FbTk::ROT270; 769 orient = FbTk::ROT90;
770 frame.x = head_x + head_w - frame.width - border_width*2; 770 frame.x = head_x + head_w - frame.width - border_width*2;
771 frame.y = head_y + head_h - frame.height - border_width*2; 771 frame.y = head_y + head_h - frame.height - border_width*2;
772 frame.x_hidden = frame.x + frame.width - bevel_width - border_width; 772 frame.x_hidden = frame.x + frame.width - bevel_width - border_width;
@@ -953,12 +953,12 @@ void Toolbar::rearrangeItems() {
953 case LEFTTOP: 953 case LEFTTOP:
954 case LEFTCENTER: 954 case LEFTCENTER:
955 case LEFTBOTTOM: 955 case LEFTBOTTOM:
956 orient = FbTk::ROT90; 956 orient = FbTk::ROT270;
957 break; 957 break;
958 case RIGHTTOP: 958 case RIGHTTOP:
959 case RIGHTCENTER: 959 case RIGHTCENTER:
960 case RIGHTBOTTOM: 960 case RIGHTBOTTOM:
961 orient = FbTk::ROT270; 961 orient = FbTk::ROT90;
962 break; 962 break;
963 default: 963 default:
964 orient = FbTk::ROT0; 964 orient = FbTk::ROT0;