ソースを参照

Merge branch 'master' of github.com:dylanaraps/neofetch

Dylan Araps 5 年 前
コミット
e79930ad74
1 ファイル変更50 行追加1 行削除
  1. 50 1
      neofetch

+ 50 - 1
neofetch

@@ -602,6 +602,19 @@ block_width=3
 # Flag:     --block_height
 # Flag:     --block_height
 block_height=1
 block_height=1
 
 
+# Color Alignment
+#
+# Default: 'auto'
+# Values: 'auto', 'num'
+# Flag: --col_offset
+#
+# Number specifies how far from the left side of the terminal (in spaces) to
+# begin printing the columns, in case you want to e.g. center them under your
+# text.
+# Example:
+# col_offset="auto" - Default behavior of neofetch
+# col_offset=7      - Leave 7 spaces then print the colors
+col_offset="auto"
 
 
 # Progress Bars
 # Progress Bars
 
 
@@ -3520,7 +3533,10 @@ get_cols() {
         # Add block height to info height.
         # Add block height to info height.
         ((info_height+=block_range[1]>7?block_height+3:block_height+2))
         ((info_height+=block_range[1]>7?block_height+3:block_height+2))
 
 
-        printf '\n\e[%bC%b\n\n' "$text_padding" "${zws}${cols}"
+        case $col_offset in
+            "auto") printf '\n\e[%bC%b\n\n' "$text_padding" "${zws}${cols}" ;;
+            *) printf '\n\e[%bC%b\n\n' "$col_offset" "${zws}${cols}" ;;
+        esac
     fi
     fi
 
 
     unset -v blocks blocks2 cols
     unset -v blocks blocks2 cols
@@ -4544,6 +4560,7 @@ TEXT FORMATTING:
 
 
 COLOR BLOCKS:
 COLOR BLOCKS:
     --color_blocks on/off       Enable/Disable the color blocks
     --color_blocks on/off       Enable/Disable the color blocks
+    --col_offset auto/num      Left-padding of color blocks
     --block_width num           Width of color blocks in spaces
     --block_width num           Width of color blocks in spaces
     --block_height num          Height of color blocks in lines
     --block_height num          Height of color blocks in lines
     --block_range num num       Range of colors to print as blocks
     --block_range num num       Range of colors to print as blocks
@@ -4741,6 +4758,7 @@ get_args() {
             "--block_range") block_range=("$2" "$3") ;;
             "--block_range") block_range=("$2" "$3") ;;
             "--block_width") block_width="$2" ;;
             "--block_width") block_width="$2" ;;
             "--block_height") block_height="$2" ;;
             "--block_height") block_height="$2" ;;
+            "--col_offset") col_offset="$2" ;;
 
 
             # Bars
             # Bars
             "--bar_char")
             "--bar_char")
@@ -5852,6 +5870,37 @@ ${c1}            ..,:${c3}dOkxl:.
 EOF
 EOF
         ;;
         ;;
 
 
+        "cleanjaro_small"*)
+            set_colors 7 7
+            read -rd '' ascii_data <<'EOF'
+${c1}█████ ██████████
+█████ ██████████
+█████
+█████
+█████
+████████████████
+████████████████
+EOF
+        ;;
+
+        "Cleanjaro"*)
+            set_colors 7 7
+            read -rd '' ascii_data <<'EOF'
+${c1}███████▌ ████████████████
+███████▌ ████████████████
+███████▌ ████████████████
+███████▌
+███████▌
+███████▌
+███████▌
+███████▌
+█████████████████████████
+█████████████████████████
+█████████████████████████
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+EOF
+        ;;
+
         "ClearOS"*)
         "ClearOS"*)
             set_colors 2
             set_colors 2
             read -rd '' ascii_data <<'EOF'
             read -rd '' ascii_data <<'EOF'