equal
deleted
inserted
replaced
227 iDisplay.MenuArranger().StopDisplayingMenuBar(); |
227 iDisplay.MenuArranger().StopDisplayingMenuBar(); |
228 } |
228 } |
229 |
229 |
230 #ifdef RD_SCALABLE_UI_V2 |
230 #ifdef RD_SCALABLE_UI_V2 |
231 TRAP_IGNORE(iDisplay.MenuArranger().CloseStylusPopupMenuL()); |
231 TRAP_IGNORE(iDisplay.MenuArranger().CloseStylusPopupMenuL()); |
232 #endif //RD_SCALABLE_UI_V2); |
232 #endif //RD_SCALABLE_UI_V2); |
233 } |
233 } |
234 |
234 |
235 void CSwtCommandArranger::ComputeAndRefreshCbaAndMenuL(TBool aFocusedControlOnly) |
235 void CSwtCommandArranger::ComputeAndRefreshCbaAndMenuL(TBool aFocusedControlOnly) |
236 { |
236 { |
237 if (iCbaIsBeingComputed) |
237 if (iCbaIsBeingComputed) |
303 if (indexOfContainer != KErrNotFound) |
303 if (indexOfContainer != KErrNotFound) |
304 { |
304 { |
305 // Add a separator in the command menu before appending the new commands to it |
305 // Add a separator in the command menu before appending the new commands to it |
306 if (itIsNotTheFirstControlWithCommands) |
306 if (itIsNotTheFirstControlWithCommands) |
307 { |
307 { |
308 iCommandMenu->AppendSeparator(); |
308 iCommandMenu->AppendSeparatorL(); |
309 if (iCommandMenuOK) |
309 if (iCommandMenuOK) |
310 { |
310 { |
311 iCommandMenuOK->AppendSeparator(); |
311 iCommandMenuOK->AppendSeparatorL(); |
312 } |
312 } |
313 } |
313 } |
314 else |
314 else |
315 { |
315 { |
316 itIsNotTheFirstControlWithCommands = ETrue; |
316 itIsNotTheFirstControlWithCommands = ETrue; |
1598 CSwtCommandArranger::CommandContainerCompare); |
1598 CSwtCommandArranger::CommandContainerCompare); |
1599 iSearchedContainer->SetParentControl(aControl); |
1599 iSearchedContainer->SetParentControl(aControl); |
1600 return iCommands.FindInOrder(iSearchedContainer, containerOrder); |
1600 return iCommands.FindInOrder(iSearchedContainer, containerOrder); |
1601 } |
1601 } |
1602 |
1602 |
1603 #endif //RD_SCALABLE_UI_V2 |
1603 #endif //RD_SCALABLE_UI_V2 |
1604 |
1604 |