mirror of https://github.com/procxx/kepka.git
				
				
				
			Fix filter icon panel wrong hiding.
This commit is contained in:
		
							parent
							
								
									b3f8e27661
								
							
						
					
					
						commit
						ba6373a0ae
					
				| 
						 | 
					@ -280,6 +280,7 @@ void TabbedPanel::hideByTimerOrLeave() {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void TabbedPanel::prepareCacheFor(bool hiding) {
 | 
					void TabbedPanel::prepareCacheFor(bool hiding) {
 | 
				
			||||||
	if (_a_opacity.animating()) {
 | 
						if (_a_opacity.animating()) {
 | 
				
			||||||
 | 
							_hiding = hiding;
 | 
				
			||||||
		return;
 | 
							return;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -325,6 +325,7 @@ void FilterIconPanel::hideByTimerOrLeave() {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void FilterIconPanel::prepareCacheFor(bool hiding) {
 | 
					void FilterIconPanel::prepareCacheFor(bool hiding) {
 | 
				
			||||||
	if (_a_opacity.animating()) {
 | 
						if (_a_opacity.animating()) {
 | 
				
			||||||
 | 
							_hiding = hiding;
 | 
				
			||||||
		return;
 | 
							return;
 | 
				
			||||||
	}
 | 
						}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -404,7 +405,7 @@ void FilterIconPanel::hideAnimated() {
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void FilterIconPanel::toggleAnimated() {
 | 
					void FilterIconPanel::toggleAnimated() {
 | 
				
			||||||
	if (isHidden() || _hiding || _hideAfterSlide) {
 | 
						if (isHidden() || _hiding) {
 | 
				
			||||||
		showAnimated();
 | 
							showAnimated();
 | 
				
			||||||
	} else {
 | 
						} else {
 | 
				
			||||||
		hideAnimated();
 | 
							hideAnimated();
 | 
				
			||||||
| 
						 | 
					@ -421,7 +422,6 @@ void FilterIconPanel::hideFinished() {
 | 
				
			||||||
 | 
					
 | 
				
			||||||
void FilterIconPanel::showAnimated() {
 | 
					void FilterIconPanel::showAnimated() {
 | 
				
			||||||
	_hideTimer.cancel();
 | 
						_hideTimer.cancel();
 | 
				
			||||||
	_hideAfterSlide = false;
 | 
					 | 
				
			||||||
	showStarted();
 | 
						showStarted();
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -77,7 +77,6 @@ private:
 | 
				
			||||||
	Ui::Animations::Simple _a_show;
 | 
						Ui::Animations::Simple _a_show;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	bool _hiding = false;
 | 
						bool _hiding = false;
 | 
				
			||||||
	bool _hideAfterSlide = false;
 | 
					 | 
				
			||||||
	QPixmap _cache;
 | 
						QPixmap _cache;
 | 
				
			||||||
	Ui::Animations::Simple _a_opacity;
 | 
						Ui::Animations::Simple _a_opacity;
 | 
				
			||||||
	base::Timer _hideTimer;
 | 
						base::Timer _hideTimer;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue