equal
deleted
inserted
replaced
960 toScroll = scrollpane.getHorizontalScrollBar(); |
960 toScroll = scrollpane.getHorizontalScrollBar(); |
961 if (toScroll == null || !toScroll.isVisible()) { |
961 if (toScroll == null || !toScroll.isVisible()) { |
962 return; |
962 return; |
963 } |
963 } |
964 orientation = SwingConstants.HORIZONTAL; |
964 orientation = SwingConstants.HORIZONTAL; |
|
965 } else if(e.isShiftDown()){ |
|
966 JScrollBar hScroll = scrollpane.getHorizontalScrollBar(); |
|
967 if (hScroll != null && hScroll.isVisible()) { |
|
968 toScroll = hScroll; |
|
969 orientation = SwingConstants.HORIZONTAL; |
|
970 } |
965 } |
971 } |
966 |
972 |
967 e.consume(); |
973 e.consume(); |
968 |
974 |
969 if (e.getScrollType() == MouseWheelEvent.WHEEL_UNIT_SCROLL) { |
975 if (e.getScrollType() == MouseWheelEvent.WHEEL_UNIT_SCROLL) { |