diff options
| author | Martin Wimpress <[email protected]> | 2015-07-28 14:47:01 +0100 |
|---|---|---|
| committer | Martin Wimpress <[email protected]> | 2015-07-28 14:47:01 +0100 |
| commit | 0d50ed798d6c52977d557a2d6857a8f4318ccda1 (patch) | |
| tree | e93e99739802f0097482c08c730cc17d206b99b6 | |
| parent | 17f44d0183ab7ac083dc9800b2c44c65f1f789e3 (diff) | |
| parent | 8352686d856b164432732668afed24f248c17323 (diff) | |
| download | mate-power-manager-0d50ed798d6c52977d557a2d6857a8f4318ccda1.tar.bz2 mate-power-manager-0d50ed798d6c52977d557a2d6857a8f4318ccda1.tar.xz | |
Merge pull request #157 from mesouug/master
Unable to change keyboard back light #108
| -rw-r--r-- | src/gpm-common.c | 10 | ||||
| -rw-r--r-- | src/gpm-kbd-backlight.c | 5 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/gpm-common.c b/src/gpm-common.c index f71aada..c0c3c94 100644 --- a/src/gpm-common.c +++ b/src/gpm-common.c @@ -91,6 +91,9 @@ gpm_get_timestring (guint time_secs) guint gpm_discrete_from_percent (guint percentage, guint levels) { + /* for levels < 10 min value is 0 */ + gint factor; + factor = levels < 10 ? 0 : 1; /* check we are in range */ if (percentage > 100) return levels; @@ -98,7 +101,7 @@ gpm_discrete_from_percent (guint percentage, guint levels) g_warning ("levels is 0!"); return 0; } - return (guint) ((((gfloat) percentage * (gfloat) (levels - 1)) / 100.0f) + 0.5f); + return (guint) ((((gfloat) percentage * (gfloat) (levels - factor)) / 100.0f) + 0.5f); } /** @@ -113,6 +116,9 @@ gpm_discrete_from_percent (guint percentage, guint levels) guint gpm_discrete_to_percent (guint discrete, guint levels) { + /* for levels < 10 min value is 0 */ + gint factor; + factor = levels < 10 ? 0 : 1; /* check we are in range */ if (discrete > levels) return 100; @@ -120,7 +126,7 @@ gpm_discrete_to_percent (guint discrete, guint levels) g_warning ("levels is 0!"); return 0; } - return (guint) (((gfloat) discrete * (100.0f / (gfloat) (levels - 1))) + 0.5f); + return (guint) (((gfloat) discrete * (100.0f / (gfloat) (levels - factor))) + 0.5f); } diff --git a/src/gpm-kbd-backlight.c b/src/gpm-kbd-backlight.c index b3091ac..4221004 100644 --- a/src/gpm-kbd-backlight.c +++ b/src/gpm-kbd-backlight.c @@ -121,6 +121,11 @@ gpm_kbd_backlight_set (GpmKbdBacklight *backlight, goal = gpm_discrete_from_percent (percentage, backlight->priv->max_brightness); scale = percentage > backlight->priv->brightness_percent ? 1 : -1; + /* if percentage change too small force next value */ + if (goal == backlight->priv->brightness) { + goal += percentage == backlight->priv->brightness_percent ? 0 : scale; + } + /* step loop down by 1 for a dimming effect */ while (backlight->priv->brightness != goal) { backlight->priv->brightness += scale; |