← Back to branch summary

~unity-team/unity/trunk

« back to all changes in this revision

Viewing changes to plugins/unityshell/src/BFBLauncherIcon.cpp

  • Committer: Tarmac
  • Author(s): Marco Trevisan (Treviño)
  • Date: 2012-03-29 16:38:56 UTC
  • mfrom: (2096.2.5 hud-icon-type)
  • Revision ID: tarmac-20120329163856-2vea5c8kqsrpodm1
Added HUD_TYPE for Icons, this allow to draw the active triangle on that only (and not on BFB).. Fixes: https://bugs.launchpad.net/bugs/961230. Approved by Gord Allott.

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins/unityshell/src/BFBLauncherIcon.cpp
63
63
  g_variant_get(data, UBUS_OVERLAY_FORMAT_STRING,
64
64
                &overlay_identity, &can_maximise, &overlay_monitor);
65
65
 
66
 
 
67
 
  // If the hud is open, we hide the BFB iff we have a locked launcher
68
 
  if (!g_strcmp0(overlay_identity, "hud") &&
69
 
      launcher_hide_mode_ == LAUNCHER_HIDE_NEVER)
 
66
  if (overlay_identity.Str() == "dash")
70
67
  {
71
 
    SetQuirk(QUIRK_VISIBLE, !visible);
 
68
    SetQuirk(QUIRK_ACTIVE, visible);
72
69
    EmitNeedsRedraw();
73
70
  }
 
71
  // If the hud is open, we hide the BFB if we have a locked launcher
 
72
  else if (overlay_identity.Str() == "hud")
 
73
  {
 
74
    if (launcher_hide_mode_ == LAUNCHER_HIDE_NEVER)
 
75
    {
 
76
      SetQuirk(QUIRK_VISIBLE, !visible);
 
77
      EmitNeedsRedraw();
 
78
    }
 
79
  }
74
80
}
75
81
 
76
82
nux::Color BFBLauncherIcon::BackgroundColor()