summaryrefslogtreecommitdiffstats
path: root/source
diff options
context:
space:
mode:
authorDave Davenport <qball@gmpclient.org>2017-01-05 22:07:50 +0100
committerDave Davenport <qball@gmpclient.org>2017-01-05 22:07:50 +0100
commitf2a40499914469e87713642a315267954f5cc547 (patch)
tree8707f5cea4485b20548c45fa90cedc5b7e66a818 /source
parentfb59be5d72f86e7bfceb8a40efdf417d0385a829 (diff)
Remove separator
Diffstat (limited to 'source')
-rw-r--r--source/view.c2
-rw-r--r--source/widgets/separator.c162
2 files changed, 0 insertions, 164 deletions
diff --git a/source/view.c b/source/view.c
index a7ea0b7b..18386571 100644
--- a/source/view.c
+++ b/source/view.c
@@ -1382,11 +1382,9 @@ static int rofi_view_calculate_height ( RofiViewState *state )
return height;
}
if ( state->filtered_lines == 0 && !config.fixed_num_lines ) {
- widget_disable ( WIDGET ( state->input_bar_separator ) );
widget_disable ( WIDGET ( state->list_view) );
}
else {
- widget_enable ( WIDGET ( state->input_bar_separator ) );
widget_enable ( WIDGET ( state->list_view) );
}
diff --git a/source/widgets/separator.c b/source/widgets/separator.c
deleted file mode 100644
index 695af704..00000000
--- a/source/widgets/separator.c
+++ /dev/null
@@ -1,162 +0,0 @@
-/**
- * MIT/X11 License
- * Modified (c) 2016-2017 Qball Cow <qball@gmpclient.org>
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#include <config.h>
-#include <xkbcommon/xkbcommon.h>
-#include <glib.h>
-#include <string.h>
-#include "widgets/widget.h"
-#include "widgets/widget-internal.h"
-#include "widgets/separator.h"
-#include "x11-helper.h"
-#include "theme.h"
-
-/**
- * @param sp The separator widget handle.
- * @param style_str String representation of the style.
- *
- * Sets the line style based on the string style_str
- */
-void separator_set_line_style_from_string ( separator *sp, const char *style_str );
-
-/**
- * @param sp The separator widget handle.
- * @param style The new style.
- *
- * Sets the line style.
- */
-void separator_set_line_style ( separator *sp, separator_line_style style );
-
-/**
- * Internal structure for the separator.
- */
-struct _separator
-{
- widget widget;
- separator_type type;
- separator_line_style line_style;
- int separator_width;
-};
-
-/** Configuration value for separator style indicating no line */
-const char *const _separator_style_none = "none";
-/** Configuration value for separator style indicating dashed line. */
-const char *const _separator_style_dash = "dash";
-static void separator_draw ( widget *, cairo_t * );
-static void separator_free ( widget * );
-
-static int separator_get_desired_height ( widget *wid )
-{
- separator *sb = (separator *)wid;
- int height = sb->separator_width;
- height += widget_padding_get_padding_height ( WIDGET (sb) );
- return height;
-}
-
-separator *separator_create ( const char *name, separator_type type, short sw )
-{
- separator *sb = g_malloc0 ( sizeof ( separator ) );
- widget_init ( WIDGET (sb), name );
- sb->type = type;
- sb->separator_width = sw;
- sb->widget.x = 0;
- sb->widget.y = 0;
- if ( sb->type == S_HORIZONTAL ) {
- sb->widget.w = 1;
- sb->widget.h = MAX ( 1, sw )+widget_padding_get_padding_height ( WIDGET (sb) );
- }
- else {
- sb->widget.h = 1;
- sb->widget.w = MAX ( 1, sw )+widget_padding_get_padding_width ( WIDGET ( sb ) );
- }
-
- sb->widget.draw = separator_draw;
- sb->widget.free = separator_free;
- sb->widget.get_desired_height = separator_get_desired_height;
-
- // Enabled by default
- sb->widget.enabled = TRUE;
-
- const char *line_style = rofi_theme_get_string ( WIDGET (sb), "line-style", "solid");
- separator_set_line_style_from_string ( sb, line_style );
- return sb;
-}
-
-static void separator_free ( widget *wid )
-{
- separator *sb = (separator *) wid;
- g_free ( sb );
-}
-
-void separator_set_line_style ( separator *sp, separator_line_style style )
-{
- if ( sp ) {
- sp->line_style = style;
- widget_need_redraw ( WIDGET ( sp ) );
- }
-}
-void separator_set_line_style_from_string ( separator *sp, const char *style_str )
-{
- if ( !sp ) {
- return;
- }
- separator_line_style style = S_LINE_SOLID;
- if ( g_strcmp0 ( style_str, _separator_style_none ) == 0 ) {
- style = S_LINE_NONE;
- }
- else if ( g_strcmp0 ( style_str, _separator_style_dash ) == 0 ) {
- style = S_LINE_DASH;
- }
- separator_set_line_style ( sp, style );
-}
-
-static void separator_draw ( widget *wid, cairo_t *draw )
-{
- separator *sep = (separator *) wid;
- if ( sep->line_style == S_LINE_NONE ) {
- // Nothing to draw.
- return;
- }
- color_separator ( draw );
- rofi_theme_get_color ( wid, "foreground", draw );
- if ( sep->line_style == S_LINE_DASH ) {
- const double dashes[1] = { 4 };
- cairo_set_dash ( draw, dashes, 1, 0.0 );
- }
- if ( sep->type == S_HORIZONTAL ) {
- int height= widget_padding_get_remaining_height ( wid );
- cairo_set_line_width ( draw, height );
- double half = height / 2.0;
- cairo_move_to ( draw, widget_padding_get_left ( wid ), widget_padding_get_top ( wid ) + half );
- cairo_line_to ( draw, wid->w-widget_padding_get_right ( wid ), widget_padding_get_top ( wid ) + half );
- }
- else {
- int width = widget_padding_get_remaining_width ( wid );
- cairo_set_line_width ( draw, width);
- double half = width / 2.0;
- cairo_move_to ( draw, widget_padding_get_left ( wid ) + half, widget_padding_get_top ( wid ));
- cairo_line_to ( draw, widget_padding_get_left ( wid ) + half, wid->h-widget_padding_get_bottom ( wid ) );
- }
- cairo_stroke ( draw );
-}