163 + /* Instead of defining a new type of ActionArg we only use the "button" 164 + * ActionArg value to indicate to the view if we're performing a quick 165 + * switch or not. */ 166 + unsigned int is_quick = (view_window_ && view_window_->IsVisible()) ? 0 : 1; 167 + 168 if (model_->detail_selection) 169 { 170 - selection->Activate(ActionArg(ActionArg::SWITCHER, 0, model_->DetailSelectionWindow ())); 171 + selection->Activate(ActionArg(ActionArg::SWITCHER, is_quick, model_->DetailSelectionWindow ())); 172 } 173 else 174 { 175 if (selection->GetQuirk (AbstractLauncherIcon::QUIRK_ACTIVE) && 176 !model_->DetailXids().empty ()) 177 { 178 - selection->Activate(ActionArg (ActionArg::SWITCHER, 0, model_->DetailXids()[0])); 179 + selection->Activate(ActionArg (ActionArg::SWITCHER, is_quick, model_->DetailXids()[0])); 180 } 181 else 182 { 183 - selection->Activate(ActionArg(ActionArg::SWITCHER, 0)); 184 + selection->Activate(ActionArg(ActionArg::SWITCHER, is_quick)); 185 } 186 }
is_quick is confusing here.
I say drop the boolean parameter and have
enum class RaiseBehaviour { RaiseActive, RaiseAll }
« Back to merge proposal
163 + /* Instead of defining a new type of ActionArg we only use the "button" ->IsVisible( )) ? 0 : 1; ->detail_ selection) >Activate( ActionArg( ActionArg: :SWITCHER, 0, model_- >DetailSelectio nWindow ())); >Activate( ActionArg( ActionArg: :SWITCHER, is_quick, model_- >DetailSelectio nWindow ())); >GetQuirk (AbstractLaunch erIcon: :QUIRK_ ACTIVE) && ->DetailXids( ).empty ()) >Activate( ActionArg (ActionArg: :SWITCHER, 0, model_- >DetailXids( )[0])); >Activate( ActionArg (ActionArg: :SWITCHER, is_quick, model_- >DetailXids( )[0])); >Activate( ActionArg( ActionArg: :SWITCHER, 0)); >Activate( ActionArg( ActionArg: :SWITCHER, is_quick));
164 + * ActionArg value to indicate to the view if we're performing a quick
165 + * switch or not. */
166 + unsigned int is_quick = (view_window_ && view_window_
167 +
168 if (model_
169 {
170 - selection-
171 + selection-
172 }
173 else
174 {
175 if (selection-
176 !model_
177 {
178 - selection-
179 + selection-
180 }
181 else
182 {
183 - selection-
184 + selection-
185 }
186 }
is_quick is confusing here.
I say drop the boolean parameter and have
enum class RaiseBehaviour
{
RaiseActive,
RaiseAll
}