~feng-kylin/unity/unityshell-rotated-kylin

« back to all changes in this revision

Viewing changes to panel/PanelMenuView.cpp

Committer: handsome_feng
Date: 2015-12-23 01:13:33 UTC
mfrom: (3999.2.68 unity)
Revision ID: 445865575@qq.com-20151223011333-gm1y3os6xzdzfstb

merge trunk

files added:
a11y

a11y/CMakeLists.txt

a11y/pch

a11y/pch/a11y_pch.hh

files removed:
plugins/unityshell/src/Monitor.cpp

plugins/unityshell/src/Monitor.h

tests/test_overlay_scrollbar.cpp

unity-shared/VScrollBarOverlayWindow.cpp

unity-shared/VScrollBarOverlayWindow.h

files renamed:
plugins/unityshell/src/nux-area-accessible.cpp => a11y/nux-area-accessible.cpp

plugins/unityshell/src/nux-area-accessible.h => a11y/nux-area-accessible.h

plugins/unityshell/src/nux-base-window-accessible.cpp => a11y/nux-base-window-accessible.cpp

plugins/unityshell/src/nux-base-window-accessible.h => a11y/nux-base-window-accessible.h

plugins/unityshell/src/nux-layout-accessible.cpp => a11y/nux-layout-accessible.cpp

plugins/unityshell/src/nux-layout-accessible.h => a11y/nux-layout-accessible.h

plugins/unityshell/src/nux-object-accessible.cpp => a11y/nux-object-accessible.cpp

plugins/unityshell/src/nux-object-accessible.h => a11y/nux-object-accessible.h

plugins/unityshell/src/nux-text-entry-accessible.cpp => a11y/nux-text-entry-accessible.cpp

plugins/unityshell/src/nux-text-entry-accessible.h => a11y/nux-text-entry-accessible.h

plugins/unityshell/src/nux-view-accessible.cpp => a11y/nux-view-accessible.cpp

plugins/unityshell/src/nux-view-accessible.h => a11y/nux-view-accessible.h

plugins/unityshell/src/unity-dash-view-accessible.cpp => a11y/unity-dash-view-accessible.cpp

plugins/unityshell/src/unity-dash-view-accessible.h => a11y/unity-dash-view-accessible.h

plugins/unityshell/src/unity-expander-view-accessible.cpp => a11y/unity-expander-view-accessible.cpp

plugins/unityshell/src/unity-expander-view-accessible.h => a11y/unity-expander-view-accessible.h

plugins/unityshell/src/unity-filter-basic-button-accessible.cpp => a11y/unity-filter-basic-button-accessible.cpp

plugins/unityshell/src/unity-filter-basic-button-accessible.h => a11y/unity-filter-basic-button-accessible.h

plugins/unityshell/src/unity-launcher-accessible.cpp => a11y/unity-launcher-accessible.cpp

plugins/unityshell/src/unity-launcher-accessible.h => a11y/unity-launcher-accessible.h

plugins/unityshell/src/unity-launcher-icon-accessible.cpp => a11y/unity-launcher-icon-accessible.cpp

plugins/unityshell/src/unity-launcher-icon-accessible.h => a11y/unity-launcher-icon-accessible.h

plugins/unityshell/src/unity-panel-view-accessible.cpp => a11y/unity-panel-view-accessible.cpp

plugins/unityshell/src/unity-panel-view-accessible.h => a11y/unity-panel-view-accessible.h

plugins/unityshell/src/unity-places-group-accessible.cpp => a11y/unity-places-group-accessible.cpp

plugins/unityshell/src/unity-places-group-accessible.h => a11y/unity-places-group-accessible.h

plugins/unityshell/src/unity-quicklist-accessible.cpp => a11y/unity-quicklist-accessible.cpp

plugins/unityshell/src/unity-quicklist-accessible.h => a11y/unity-quicklist-accessible.h

plugins/unityshell/src/unity-quicklist-menu-accessible.cpp => a11y/unity-quicklist-menu-accessible.cpp

plugins/unityshell/src/unity-quicklist-menu-accessible.h => a11y/unity-quicklist-menu-accessible.h

plugins/unityshell/src/unity-quicklist-menu-item-accessible.cpp => a11y/unity-quicklist-menu-item-accessible.cpp

plugins/unityshell/src/unity-quicklist-menu-item-accessible.h => a11y/unity-quicklist-menu-item-accessible.h

plugins/unityshell/src/unity-result-accessible.cpp => a11y/unity-result-accessible.cpp

plugins/unityshell/src/unity-result-accessible.h => a11y/unity-result-accessible.h

plugins/unityshell/src/unity-root-accessible.cpp => a11y/unity-root-accessible.cpp

plugins/unityshell/src/unity-root-accessible.h => a11y/unity-root-accessible.h

plugins/unityshell/src/unity-rvgrid-accessible.cpp => a11y/unity-rvgrid-accessible.cpp

plugins/unityshell/src/unity-rvgrid-accessible.h => a11y/unity-rvgrid-accessible.h

plugins/unityshell/src/unity-scope-bar-icon-accessible.cpp => a11y/unity-scope-bar-icon-accessible.cpp

plugins/unityshell/src/unity-scope-bar-icon-accessible.h => a11y/unity-scope-bar-icon-accessible.h

plugins/unityshell/src/unity-sctext-accessible.cpp => a11y/unity-sctext-accessible.cpp

plugins/unityshell/src/unity-sctext-accessible.h => a11y/unity-sctext-accessible.h

plugins/unityshell/src/unity-search-bar-accessible.cpp => a11y/unity-search-bar-accessible.cpp

plugins/unityshell/src/unity-search-bar-accessible.h => a11y/unity-search-bar-accessible.h

plugins/unityshell/src/unity-session-button-accessible.cpp => a11y/unity-session-button-accessible.cpp

plugins/unityshell/src/unity-session-button-accessible.h => a11y/unity-session-button-accessible.h

plugins/unityshell/src/unity-switcher-accessible.cpp => a11y/unity-switcher-accessible.cpp

plugins/unityshell/src/unity-switcher-accessible.h => a11y/unity-switcher-accessible.h

plugins/unityshell/src/unity-text-input-accessible.cpp => a11y/unity-text-input-accessible.cpp

plugins/unityshell/src/unity-text-input-accessible.h => a11y/unity-text-input-accessible.h

plugins/unityshell/src/unity-util-accessible.cpp => a11y/unity-util-accessible.cpp

plugins/unityshell/src/unity-util-accessible.h => a11y/unity-util-accessible.h

plugins/unityshell/src/unitya11y.cpp => a11y/unitya11y.cpp

plugins/unityshell/src/unitya11y.h => a11y/unitya11y.h

plugins/unityshell/src/unitya11ytests.cpp => a11y/unitya11ytests.cpp

plugins/unityshell/src/unitya11ytests.h => a11y/unitya11ytests.h

files modified:
CMakeLists.txt

dash/PlacesGroup.cpp

dash/ScopeView.cpp

dash/ScopeView.h

dash/StandaloneDash.cpp

dash/pch/dash_pch.hh

debian/changelog

debian/control

debian/rules

debian/source_unity.py

launcher/AbstractLauncherIcon.h

launcher/ApplicationLauncherIcon.cpp

launcher/ExpoLauncherIcon.cpp

launcher/ExpoLauncherIcon.h

launcher/LauncherController.cpp

launcher/LauncherController.h

launcher/LauncherIcon.cpp

launcher/LauncherIcon.h

launcher/LauncherModel.cpp

launcher/LauncherModel.h

launcher/SwitcherController.cpp

launcher/SwitcherController.h

launcher/SwitcherControllerImpl.h

launcher/SwitcherModel.cpp

launcher/SwitcherModel.h

launcher/SwitcherView.cpp

launcher/SwitcherView.h

lockscreen/LockScreenPanel.cpp

lockscreen/UserPromptView.cpp

panel/PanelIndicatorEntryView.cpp

panel/PanelMenuView.cpp

panel/PanelMenuView.h

panel/PanelView.cpp

plugins/unityshell/CMakeLists.txt

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

resources/album_missing.png

resources/album_missing_preview.png

resources/category_gradient.png

resources/category_gradient_no_refine.png

resources/dash_bottom_border_tile.png

resources/dash_bottom_border_tile_mask.png

resources/dash_bottom_left_corner.png

resources/dash_bottom_left_corner_mask.png

resources/dash_bottom_right_corner.png

resources/dash_bottom_right_corner_mask.png

resources/dash_group_expand.png

resources/dash_group_unexpand.png

resources/dash_left_tile.png

resources/dash_noise.png

resources/dash_right_border_tile.png

resources/dash_right_border_tile_mask.png

resources/dash_sheen.png

resources/dash_top_edge.png

resources/dash_top_right_corner.png

resources/dash_top_right_corner_mask.png

resources/dash_top_tile.png

resources/dialog_close.png

resources/dialog_close_highlight.png

resources/dialog_close_press.png

resources/hibernate.png

resources/hibernate_highlight.png

resources/launcher_bfb.png

resources/launcher_icon_glow_62.png

resources/launcher_pressure_effect.png

resources/lock_icon.png

resources/lockscreen.png

resources/lockscreen_highlight.png

resources/logout.png

resources/logout_highlight.png

resources/panel-shadow.png

resources/pattern_overlay.png

resources/places-tile-bg-tilable.png

resources/refine_gradient_corner.png

resources/refine_gradient_dash.png

resources/refine_gradient_panel.png

resources/refine_gradient_panel_single_column.png

resources/restart.png

resources/restart_highlight.png

resources/round_corner_54x54.png

resources/round_glow_62x62.png

resources/round_glow_hl_62x62.png

resources/round_shine_54x54.png

resources/search_close.png

resources/search_spin.png

resources/shutdown.png

resources/shutdown_highlight.png

resources/squircle_base_selected_54.png

resources/squircle_edge_54.png

resources/squircle_shine_54.png

resources/star_deselected.png

resources/suspend.png

resources/suspend_highlight.png

resources/switcher_background.png

resources/switcher_corner.png

resources/switcher_left.png

resources/switcher_top.png

resources/video_missing.png

resources/warning_icon.png

shortcuts/AbstractShortcutHint.h

shortcuts/CompizShortcutModeller.cpp

shortcuts/MockShortcutHint.h

shortcuts/ShortcutController.cpp

shortcuts/ShortcutHint.cpp

tests/CMakeLists.txt

tests/autopilot/unity/emulators/switcher.py

tests/gmockvolume.c

tests/test_keyboard_util.cpp

tests/test_layout_system.cpp

tests/test_switcher_controller.cpp

tests/test_switcher_controller.h

tests/test_switcher_controller_class.cpp

tests/test_switcher_model.cpp

tests/test_switcher_view.cpp

tools/unity.cmake

unity-shared/CMakeLists.txt

unity-shared/CoverArt.cpp

unity-shared/GnomeKeyGrabber.cpp

unity-shared/GnomeKeyGrabberImpl.h

unity-shared/LayoutSystem.cpp

unity-shared/LayoutSystem.h

unity-shared/OverlayScrollView.cpp

unity-shared/OverlayWindowButtons.cpp

unity-shared/PlacesOverlayVScrollBar.cpp

unity-shared/PlacesOverlayVScrollBar.h

unity-shared/PlacesVScrollBar.cpp

unity-shared/PlacesVScrollBar.h

unity-shared/PluginAdapter.cpp

unity-shared/PluginAdapter.h

unity-shared/SpreadFilter.cpp

unity-shared/SpreadFilter.h

unity-shared/StandaloneWindowManager.cpp

unity-shared/StandaloneWindowManager.h

unity-shared/TextInput.cpp

unity-shared/TextInput.h

unity-shared/WindowManager.h

unity-shared/XKeyboardUtil.cpp

unity-shared/XKeyboardUtil.h

Show diffs side-by-side

added added

removed removed

panel/PanelMenuView.cpp

102

, ignore_menu_visibility_(false)

103

, integrated_menus_(menu_manager_->integrated_menus())

104

, always_show_menus_(menu_manager_->always_show_menus())

105

, ignore_leave_events_(false)

105

106

, desktop_name_(get_current_desktop())

106

107

{

107

108

if (ApplicationWindowPtr const& win = ApplicationManager::Default().GetActiveWindow())

178

179

window_buttons_ = new WindowButtons();

179

180

window_buttons_->SetParentObject(this);

180

181

window_buttons_->monitor = monitor_;

181

window_buttons_->controlled_window = active_window();

182

window_buttons_->opacity = 0.0f;

183

window_buttons_->SetLeftAndRightPadding(MAIN_LEFT_PADDING, MENUBAR_PADDING);

184

window_buttons_->SetMaximumHeight(panel::Style::Instance().PanelHeight(monitor_));

1814

}

1815

}

1816

1817

void PanelMenuView::IgnoreLeaveEvents(bool ignore)

1818

{

1819

ignore_leave_events_ = ignore;

1820

}

1821

1817

1822

void PanelMenuView::OnPanelViewMouseLeave(int x, int y, unsigned long mouse_button_state, unsigned long special_keys_state)

1818

1823

{

1819

if (always_show_menus_)

1824

if (always_show_menus_ || ignore_leave_events_)

1820

1825

return;

1821

1826

1822

1827

if (is_inside_)

Older »