~3v1n0/unity/fix-load-icon-crash-926658

« back to all changes in this revision

Viewing changes to panel/PanelIndicatorEntryView.cpp

Committer: Marco Trevisan (Treviño)
Date: 2012-08-10 12:35:24 UTC
mfrom: (2509.1.36 unity)
Revision ID: mail@3v1n0.net-20120810123524-l41egcjcmt778uzc

Merging with trunk

files added:
plugins/unityshell/src/UnityGestureTarget.cpp

plugins/unityshell/src/UnityGestureTarget.h

plugins/unityshell/src/WindowGestureTarget.cpp

plugins/unityshell/src/WindowGestureTarget.h

tests/test-gestures/FakeGestureEvent.h

tests/test-gestures/NuxMock.h

tests/test-gestures/UnityGestureTargetMock.h

tests/test-gestures/WindowGestureTargetMock.h

tests/test-gestures/sed_script_gesture

tests/test-gestures/test_gestures_main.cpp

tests/test-gestures/test_window_gesture_target.cpp

tests/test-gestures/unityshell_mock.h

tests/test_panel_style.cpp

files removed:
launcher/GeisAdapter.cpp

launcher/GeisAdapter.h

tests/test-gesture-engine/GeisAdapterMock.cpp

tests/test-gesture-engine/GeisAdapterMock.h

files renamed:
plugins/unityshell/src/GestureEngine.cpp => plugins/unityshell/src/UnityGestureBroker.cpp

plugins/unityshell/src/GestureEngine.h => plugins/unityshell/src/UnityGestureBroker.h

tests/test-gesture-engine/ => tests/test-gestures/

tests/test-gesture-engine/sed_script => tests/test-gestures/sed_script_broker

tests/test-gesture-engine/test_gesture_engine.cpp => tests/test-gestures/test_gesture_broker.cpp

files modified:
AUTHORS

CMakeLists.txt

ChangeLog

HACKING

UnityCore/CMakeLists.txt

UnityCore/HomeLens.cpp

dash/ResultViewGrid.cpp

launcher/CMakeLists.txt

launcher/FavoriteStoreGSettings.cpp

launcher/FavoriteStoreGSettings.h

launcher/Launcher.cpp

launcher/Launcher.h

launcher/LauncherController.cpp

launcher/LauncherController.h

launcher/LauncherModel.cpp

launcher/StandaloneLauncher.cpp

launcher/SwitcherController.cpp

launcher/SwitcherController.h

launcher/TrashLauncherIcon.cpp

launcher/TrashLauncherIcon.h

manual-tests/Launcher.txt

panel/PanelIndicatorEntryView.cpp

panel/PanelMenuView.cpp

panel/PanelView.cpp

plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp

plugins/unitydialog/src/unitydialog.cpp

plugins/unityshell/CMakeLists.txt

plugins/unityshell/src/nux-layout-accessible.cpp

plugins/unityshell/src/unity-launcher-accessible.cpp

plugins/unityshell/src/unity-switcher-accessible.cpp

plugins/unityshell/src/unityshell.cpp

plugins/unityshell/src/unityshell.h

plugins/unityshell/unityshell.xml.in

po/POTFILES.in

services/panel-main.c

tests/CMakeLists.txt

tests/autopilot/unity/tests/launcher/test_icon_behavior.py

tests/autopilot/unity/tests/test_dash.py

tests/autopilot/unity/tests/test_panel.py

tests/autopilot/unity/tests/test_quicklist.py

tests/autopilot/unity/tests/test_switcher.py

tests/test-gestures/CMakeLists.txt

tests/test-gestures/compiz_mock/core/screen.h

tests/test-gestures/compiz_mock/core/window.h

tests/test_favorite_store_gsettings.cpp

tests/test_launcher_controller.cpp

tests/test_main.cpp

tests/test_switcher_controller.cpp

unity-shared/BGHash.cpp

unity-shared/DashStyle.cpp

unity-shared/IconRenderer.cpp

unity-shared/PanelStyle.cpp

unity-shared/PanelStyle.h

unity-shared/PluginAdapterCompiz.cpp

unity-standalone/StandaloneUnity.cpp

Show diffs side-by-side

added added

removed removed

panel/PanelIndicatorEntryView.cpp

429

unsigned int width = 0;

430

unsigned int icon_width = 0;

431

unsigned int height = panel::Style::Instance().panel_height;

432

unsigned int text_width = 0;

433

432

434

433

// First lets figure out our size

435

434

if (pixbuf && IsIconVisible())

484

483

pango_layout_context_changed(layout);

485

484

486

485

pango_layout_get_extents(layout, nullptr, &log_rect);

487

text_width = log_rect.width / PANGO_SCALE;

486

unsigned int text_width = log_rect.width / PANGO_SCALE;

488

487

489

488

if (icon_width)

490

489

width += spacing_;

Older »