From 403b1d0423b52f5018c7e7971db1942cd5bd80ba Mon Sep 17 00:00:00 2001 From: Radek Kintop Date: Wed, 29 Mar 2017 16:35:25 +0200 Subject: [PATCH] No progress bars on Contrast, Brightness and Color buttons Change-Id: I2996bd04f29b224b573eaff973f55c30e80450e2 Signed-off-by: Radek Kintop --- include/data/settings_picture.h | 21 --------------------- src/data/settings_picture.c | 35 ----------------------------------- src/layout/layout_picture.c | 6 +++--- 3 files changed, 3 insertions(+), 59 deletions(-) diff --git a/include/data/settings_picture.h b/include/data/settings_picture.h index 945abcc..82f2209 100644 --- a/include/data/settings_picture.h +++ b/include/data/settings_picture.h @@ -55,13 +55,6 @@ void settings_picture_set_tint_g(int val); int settings_picture_get_contrast(void); /** -* @brief Gets picture contrast relative value. -* -* @return Picture contrast relative value -*/ -float settings_picture_get_contrast_relative(void); - -/** * @brief Gets picture brightness value. * * @return Picture brightness value @@ -69,13 +62,6 @@ float settings_picture_get_contrast_relative(void); int settings_picture_get_brightness(void); /** -* @brief Gets picture brightness relative value. -* -* @return Picture brightness ralative value -*/ -float settings_picture_get_brightness_relative(void); - -/** * @brief Gets picture max brightness value. * * @return Picture max brightness value @@ -90,13 +76,6 @@ int settings_picture_get_max_brightness(void); int settings_picture_get_color(void); /** -* @brief Gets picture color relative value. -* -* @return Picture color relative value -*/ -float settings_picture_get_color_relative(void); - -/** * @brief Gets picture tint value. * * @return Picture tint value diff --git a/src/data/settings_picture.c b/src/data/settings_picture.c index 442b402..4802f8b 100644 --- a/src/data/settings_picture.c +++ b/src/data/settings_picture.c @@ -94,16 +94,6 @@ int settings_picture_get_contrast(void) return temp_contrast; } -float settings_picture_get_contrast_relative(void) -{ - if (CONTRAST_MAX_VALUE == CONTRAST_MIN_VALUE) { - _ERR("Contrast max and min values are equal"); - return .0; - } - return (float)(settings_picture_get_contrast() - CONTRAST_MIN_VALUE) - / (CONTRAST_MAX_VALUE - CONTRAST_MIN_VALUE); -} - int settings_picture_get_brightness(void) { int curr; @@ -132,37 +122,12 @@ int settings_picture_get_max_brightness(void) return max; } -float settings_picture_get_brightness_relative(void) -{ - int max, curr; - - max = settings_picture_get_max_brightness(); - if (max - BRIGHTNESS_MIN_VALUE == 0) { - _ERR("Brightness max and min values are equal"); - return .0; - } - - curr = settings_picture_get_brightness(); - - return (float)curr/(max - BRIGHTNESS_MIN_VALUE); -} - int settings_picture_get_color(void) { //@TODO: get color return temp_color; } -float settings_picture_get_color_relative(void) -{ - if (COLOR_MAX_VALUE == COLOR_MIN_VALUE) { - _ERR("Color max and min values are equal"); - return .0; - } - return (float)(settings_picture_get_color() - COLOR_MIN_VALUE) - / (COLOR_MAX_VALUE - COLOR_MIN_VALUE); -} - int settings_picture_get_tint_g(void) { //@TODO: get tint diff --git a/src/layout/layout_picture.c b/src/layout/layout_picture.c index a4c3bc4..cab0c49 100644 --- a/src/layout/layout_picture.c +++ b/src/layout/layout_picture.c @@ -67,7 +67,7 @@ static struct menumgr_info menu_info[] = { .style = STYLE_PROGRESS_BTN, .disabled = EINA_FALSE, .status = _get_contrast, - .progress_value = settings_picture_get_contrast_relative, + .progress_value = NULL, .progress_evas = NULL, .selected = _selected, .focused = _focused, @@ -80,7 +80,7 @@ static struct menumgr_info menu_info[] = { .style = STYLE_PROGRESS_BTN, .disabled = EINA_FALSE, .status = _get_brightness, - .progress_value = settings_picture_get_brightness_relative, + .progress_value = NULL, .progress_evas = NULL, .selected = _selected, .focused = _focused, @@ -93,7 +93,7 @@ static struct menumgr_info menu_info[] = { .style = STYLE_PROGRESS_BTN, .disabled = EINA_FALSE, .status = _get_color, - .progress_value = settings_picture_get_color_relative, + .progress_value = NULL, .progress_evas = NULL, .selected = _selected, .focused = _focused, -- 2.7.4