Skip to content

Commit ea4ab83

Browse files
zhangxianwei8raveit65
zhangxianwei8
authored and
raveit65
committed
media-keys: Remove unuseful show_level argument in msd_media_keys_window_set_action_custom
Since brightness OSD has been moved to m-p-m, there is no any situation to use show_level in msd_media_keys_window_set_action_custom, should remove this argument. Signed-off-by: Zhang Xianwei <[email protected]>
1 parent 4971d19 commit ea4ab83

File tree

4 files changed

+13
-50
lines changed

4 files changed

+13
-50
lines changed

‎plugins/media-keys/msd-media-keys-manager.c‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -581,8 +581,7 @@ do_eject_action (MsdMediaKeysManager *manager)
581581
/* Show the dialogue */
582582
dialog_init (manager);
583583
msd_media_keys_window_set_action_custom (MSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
584-
"media-eject",
585-
FALSE);
584+
"media-eject");
586585
dialog_show (manager);
587586

588587
/* Clean up the drive selection and exit if no suitable
@@ -607,8 +606,7 @@ do_touchpad_osd_action (MsdMediaKeysManager *manager, gboolean state)
607606
{
608607
dialog_init (manager);
609608
msd_media_keys_window_set_action_custom (MSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
610-
state ? "input-touchpad" : "touchpad-disabled",
611-
FALSE);
609+
state ? "input-touchpad" : "touchpad-disabled");
612610
dialog_show (manager);
613611
}
614612

@@ -849,13 +847,11 @@ set_rfkill_complete (GObject *object,
849847
if (data->bluetooth)
850848
msd_media_keys_window_set_action_custom (MSD_MEDIA_KEYS_WINDOW (data->manager->priv->dialog),
851849
data->target_state ? "bluetooth-disabled-symbolic"
852-
: "bluetooth-active-symbolic",
853-
FALSE);
850+
: "bluetooth-active-symbolic");
854851
else
855852
msd_media_keys_window_set_action_custom (MSD_MEDIA_KEYS_WINDOW (data->manager->priv->dialog),
856853
data->target_state ? "airplane-mode-symbolic"
857-
: "network-wireless-signal-excellent-symbolic",
858-
FALSE);
854+
: "network-wireless-signal-excellent-symbolic");
859855
dialog_show (data->manager);
860856
out:
861857
g_free (data->property);
@@ -884,8 +880,7 @@ do_rfkill_action (MsdMediaKeysManager *manager,
884880

885881
if (get_rfkill_property (manager, hw_mode)) {
886882
msd_media_keys_window_set_action_custom (MSD_MEDIA_KEYS_WINDOW (manager->priv->dialog),
887-
"airplane-mode-symbolic",
888-
FALSE);
883+
"airplane-mode-symbolic");
889884
dialog_show (manager);
890885
return;
891886
}

‎plugins/media-keys/msd-media-keys-window.c‎

Lines changed: 4 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ struct MsdMediaKeysWindowPrivate
3838
{
3939
MsdMediaKeysWindowAction action;
4040
char *icon_name;
41-
gboolean show_level;
4241

4342
guint volume_muted : 1;
4443
int volume_level;
@@ -90,7 +89,7 @@ action_changed (MsdMediaKeysWindow *window)
9089

9190
break;
9291
case MSD_MEDIA_KEYS_WINDOW_ACTION_CUSTOM:
93-
volume_controls_set_visible (window, window->priv->show_level);
92+
volume_controls_set_visible (window, FALSE);
9493
window_set_icon_name (window, window->priv->icon_name);
9594
break;
9695
default:
@@ -148,19 +147,16 @@ msd_media_keys_window_set_action (MsdMediaKeysWindow *window,
148147

149148
void
150149
msd_media_keys_window_set_action_custom (MsdMediaKeysWindow *window,
151-
const char *icon_name,
152-
gboolean show_level)
150+
const char *icon_name)
153151
{
154152
g_return_if_fail (MSD_IS_MEDIA_KEYS_WINDOW (window));
155153
g_return_if_fail (icon_name != NULL);
156154

157155
if (window->priv->action != MSD_MEDIA_KEYS_WINDOW_ACTION_CUSTOM ||
158-
g_strcmp0 (window->priv->icon_name, icon_name) != 0 ||
159-
window->priv->show_level != show_level) {
156+
g_strcmp0 (window->priv->icon_name, icon_name) != 0) {
160157
window->priv->action = MSD_MEDIA_KEYS_WINDOW_ACTION_CUSTOM;
161158
g_free (window->priv->icon_name);
162159
window->priv->icon_name = g_strdup (icon_name);
163-
window->priv->show_level = show_level;
164160
action_changed (window);
165161
} else {
166162
msd_osd_window_update_and_hide (MSD_OSD_WINDOW (window));
@@ -578,35 +574,22 @@ draw_action_custom (MsdMediaKeysWindow *window,
578574
double icon_box_height;
579575
double icon_box_x0;
580576
double icon_box_y0;
581-
double bright_box_x0;
582-
double bright_box_y0;
583-
double bright_box_width;
584-
double bright_box_height;
585577
gboolean res;
586578

587579
gtk_window_get_size (GTK_WINDOW (window), &window_width, &window_height);
588580

589581
icon_box_width = round (window_width * 0.65);
590582
icon_box_height = round (window_height * 0.65);
591-
bright_box_width = round (icon_box_width);
592-
bright_box_height = round (window_height * 0.05);
593583

594584
icon_box_x0 = (window_width - icon_box_width) / 2;
595-
icon_box_y0 = (window_height - icon_box_height - bright_box_height) / 2;
596-
bright_box_x0 = round (icon_box_x0);
597-
bright_box_y0 = round (icon_box_height + icon_box_y0);
585+
icon_box_y0 = (window_height - icon_box_height) / 2;
598586

599587
#if 0
600588
g_message ("icon box: w=%f h=%f _x0=%f _y0=%f",
601589
icon_box_width,
602590
icon_box_height,
603591
icon_box_x0,
604592
icon_box_y0);
605-
g_message ("brightness box: w=%f h=%f _x0=%f _y0=%f",
606-
bright_box_width,
607-
bright_box_height,
608-
bright_box_x0,
609-
bright_box_y0);
610593
#endif
611594

612595
res = render_custom (window,
@@ -619,17 +602,6 @@ draw_action_custom (MsdMediaKeysWindow *window,
619602
icon_box_x0, icon_box_y0,
620603
icon_box_width, icon_box_height);
621604
}
622-
623-
if (window->priv->show_level != FALSE) {
624-
/* draw volume meter */
625-
draw_volume_boxes (window,
626-
cr,
627-
(double)window->priv->volume_level / 100.0,
628-
bright_box_x0,
629-
bright_box_y0,
630-
bright_box_width,
631-
bright_box_height);
632-
}
633605
}
634606

635607
static void

‎plugins/media-keys/msd-media-keys-window.h‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@ GtkWidget * msd_media_keys_window_new (void);
6363
void msd_media_keys_window_set_action (MsdMediaKeysWindow *window,
6464
MsdMediaKeysWindowAction action);
6565
void msd_media_keys_window_set_action_custom (MsdMediaKeysWindow *window,
66-
const char *icon_name,
67-
gboolean show_level);
66+
const char *icon_name);
6867
void msd_media_keys_window_set_volume_muted (MsdMediaKeysWindow *window,
6968
gboolean muted);
7069
void msd_media_keys_window_set_volume_level (MsdMediaKeysWindow *window,

‎plugins/media-keys/test-media-window.c‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,22 +63,19 @@ update_state (GtkWidget *window)
6363
break;
6464
case 4:
6565
msd_media_keys_window_set_action_custom (MSD_MEDIA_KEYS_WINDOW (window),
66-
"media-eject",
67-
FALSE);
66+
"media-eject");
6867

6968
gtk_widget_show (window);
7069
break;
7170
case 5:
7271
msd_media_keys_window_set_action_custom (MSD_MEDIA_KEYS_WINDOW (window),
73-
"touchpad-disabled",
74-
FALSE);
72+
"touchpad-disabled");
7573

7674
gtk_widget_show (window);
7775
break;
7876
case 6:
7977
msd_media_keys_window_set_action_custom (MSD_MEDIA_KEYS_WINDOW (window),
80-
"input-touchpad",
81-
FALSE);
78+
"input-touchpad");
8279

8380
gtk_widget_show (window);
8481
break;

0 commit comments

Comments
 (0)